mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-08-07 15:01:38 +00:00
1a253a2bb5
The latest versions of gettext rely on several changes to gnulib including both changes to modules and new modules and some previously gettext specific code being moved to gnulib. Backport these changes in order to allow updating gettext while using the local gnulib copy of sources. Add patch: - 640-mem-hash-map.patch - 645-next-prime.patch - 646-hashcode-string.patch - 647-hashkey-string.patch - 650-package-version.patch - 651-package-version-simplify.patch - 652-package-version-simplify-further.patch - 653-package-version-warning.patch - 660-version-stamp.patch - 689-vc-mtime.patch - 755-clean-temp-hashkey.patch - 795-string-desc-rename-functions.patch - 796-vc-mtime-less-read.patch - 797-vc-mtime-add-api.patch - 798-vc-mtime-add-api.patch - 799-vc-mtime-old-git.patch - 900-str_startswith-module.patch - 901-str_endswith-module.patch Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16522 Signed-off-by: Robert Marko <robimarko@gmail.com>
92 lines
4.1 KiB
Diff
92 lines
4.1 KiB
Diff
From f4c40c2d6aabef8e587176bbf5226c8bc6649574 Mon Sep 17 00:00:00 2001
|
|
From: Bruno Haible <bruno@clisp.org>
|
|
Date: Fri, 2 May 2025 02:43:23 +0200
|
|
Subject: [PATCH] vc-mtime: Add API for more efficient use of git, part 2.
|
|
|
|
* lib/vc-mtime.c (max_vc_mtime): Don't skip the odd-numbered arguments.
|
|
---
|
|
ChangeLog | 5 +++++
|
|
lib/vc-mtime.c | 57 +++++++++++++++++++++-----------------------------
|
|
2 files changed, 29 insertions(+), 33 deletions(-)
|
|
|
|
--- a/lib/vc-mtime.c
|
|
+++ b/lib/vc-mtime.c
|
|
@@ -558,17 +558,14 @@ max_vc_mtime (struct timespec *max_of_mt
|
|
size_t n = n0;
|
|
size_t cmd_len = 25;
|
|
for (; n < nfiles; n++)
|
|
- {
|
|
- if (vc_controlled[n] == 1)
|
|
- {
|
|
- if (cmd_len + strlen (currdir_relative_filenames[n]) >= MAX_CMD_LEN
|
|
- && i > i0)
|
|
- break;
|
|
- argv[i++] = currdir_relative_filenames[n];
|
|
- cmd_len += 1 + strlen (currdir_relative_filenames[n]);
|
|
- }
|
|
- n++;
|
|
- }
|
|
+ if (vc_controlled[n] == 1)
|
|
+ {
|
|
+ if (cmd_len + strlen (currdir_relative_filenames[n]) >= MAX_CMD_LEN
|
|
+ && i > i0)
|
|
+ break;
|
|
+ argv[i++] = currdir_relative_filenames[n];
|
|
+ cmd_len += 1 + strlen (currdir_relative_filenames[n]);
|
|
+ }
|
|
if (i > i0)
|
|
{
|
|
pid_t child;
|
|
@@ -672,17 +669,14 @@ max_vc_mtime (struct timespec *max_of_mt
|
|
size_t n = n0;
|
|
size_t cmd_len = 46;
|
|
for (; n < nfiles; n++)
|
|
- {
|
|
- if (vc_controlled[n] == 1)
|
|
- {
|
|
- if (cmd_len + strlen (currdir_relative_filenames[n]) >= MAX_CMD_LEN
|
|
- && i > i0)
|
|
- break;
|
|
- argv[i++] = currdir_relative_filenames[n];
|
|
- cmd_len += 1 + strlen (currdir_relative_filenames[n]);
|
|
- }
|
|
- n++;
|
|
- }
|
|
+ if (vc_controlled[n] == 1)
|
|
+ {
|
|
+ if (cmd_len + strlen (currdir_relative_filenames[n]) >= MAX_CMD_LEN
|
|
+ && i > i0)
|
|
+ break;
|
|
+ argv[i++] = currdir_relative_filenames[n];
|
|
+ cmd_len += 1 + strlen (currdir_relative_filenames[n]);
|
|
+ }
|
|
if (i > i0)
|
|
{
|
|
pid_t child;
|
|
@@ -768,17 +762,14 @@ max_vc_mtime (struct timespec *max_of_mt
|
|
size_t n = n0;
|
|
size_t cmd_len = 27;
|
|
for (; n < nfiles; n++)
|
|
- {
|
|
- if (vc_controlled[n] == 1)
|
|
- {
|
|
- if (cmd_len + strlen (currdir_relative_filenames[n]) >= MAX_CMD_LEN
|
|
- && i > i0)
|
|
- break;
|
|
- argv[i++] = currdir_relative_filenames[n];
|
|
- cmd_len += 1 + strlen (currdir_relative_filenames[n]);
|
|
- }
|
|
- n++;
|
|
- }
|
|
+ if (vc_controlled[n] == 1)
|
|
+ {
|
|
+ if (cmd_len + strlen (currdir_relative_filenames[n]) >= MAX_CMD_LEN
|
|
+ && i > i0)
|
|
+ break;
|
|
+ argv[i++] = currdir_relative_filenames[n];
|
|
+ cmd_len += 1 + strlen (currdir_relative_filenames[n]);
|
|
+ }
|
|
if (i > i0)
|
|
{
|
|
pid_t child;
|