summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2023-10-26 22:16:39 +0200
committerErich Eckner <git@eckner.net>2023-10-26 22:16:39 +0200
commit6f5cf85c6e47160cfb665fd42e7947c897835eb8 (patch)
treee5bfdcb39d09a15a662e9d04be0a18afe6b1247e /core
parent075f37d9b66e0fe6b732f1c43c1bc1d5120f90bb (diff)
downloadcrux-patches-6f5cf85c6e47160cfb665fd42e7947c897835eb8.tar.xz
update patch
Diffstat (limited to 'core')
-rw-r--r--core/coreutils/coreutils-uniq.patch.new44
1 files changed, 22 insertions, 22 deletions
diff --git a/core/coreutils/coreutils-uniq.patch.new b/core/coreutils/coreutils-uniq.patch.new
index 5e331dc..d690cf6 100644
--- a/core/coreutils/coreutils-uniq.patch.new
+++ b/core/coreutils/coreutils-uniq.patch.new
@@ -1,6 +1,6 @@
---- old/src/uniq.c 2022-04-08 13:22:18.000000000 +0200
-+++ new/src/uniq.c 2022-05-15 08:30:20.222140293 +0200
-@@ -53,6 +53,9 @@
+--- old/src/uniq.c 2023-10-26 22:16:06.128439677 +0200
++++ new/src/uniq.c 2023-10-26 22:15:43.965104621 +0200
+@@ -51,6 +51,9 @@
/* Number of fields to skip on each line when doing comparisons. */
static size_t skip_fields;
@@ -10,15 +10,15 @@
/* Number of chars to skip after skipping any fields. */
static size_t skip_chars;
-@@ -148,6 +151,7 @@
- {"ignore-case", no_argument, NULL, 'i'},
- {"unique", no_argument, NULL, 'u'},
- {"skip-fields", required_argument, NULL, 'f'},
-+ {"check-fields", required_argument, NULL, 'm'},
- {"skip-chars", required_argument, NULL, 's'},
- {"check-chars", required_argument, NULL, 'w'},
- {"zero-terminated", no_argument, NULL, 'z'},
-@@ -195,6 +199,11 @@
+@@ -146,6 +149,7 @@
+ {"ignore-case", no_argument, nullptr, 'i'},
+ {"unique", no_argument, nullptr, 'u'},
+ {"skip-fields", required_argument, nullptr, 'f'},
++ {"check-fields", required_argument, nullptr, 'm'},
+ {"skip-chars", required_argument, nullptr, 's'},
+ {"check-chars", required_argument, nullptr, 'w'},
+ {"zero-terminated", no_argument, nullptr, 'z'},
+@@ -193,6 +197,11 @@
"), stdout);
fputs (_("\
-i, --ignore-case ignore differences in case when comparing\n\
@@ -30,7 +30,7 @@
-s, --skip-chars=N avoid comparing the first N characters\n\
-u, --unique only print unique lines\n\
"), stdout);
-@@ -254,7 +263,7 @@
+@@ -252,7 +261,7 @@
ATTRIBUTE_PURE
static char *
@@ -39,7 +39,7 @@
{
size_t count;
char const *lp = line->buffer;
-@@ -271,6 +280,21 @@
+@@ -269,6 +278,21 @@
i += MIN (skip_chars, size - i);
@@ -71,7 +71,7 @@
new_group = (!prevfield
|| different (thisfield, prevfield, thislen, prevlen));
-@@ -401,8 +424,7 @@
+@@ -402,8 +425,7 @@
if (readlinebuffer_delim (prevline, stdin, delimiter) == 0)
goto closefiles;
@@ -81,7 +81,7 @@
while (!feof (stdin))
{
-@@ -415,8 +437,7 @@
+@@ -416,8 +438,7 @@
goto closefiles;
break;
}
@@ -91,7 +91,7 @@
match = !different (thisfield, prevfield, thislen, prevlen);
match_count += match;
-@@ -496,6 +517,7 @@
+@@ -497,6 +518,7 @@
skip_chars = 0;
skip_fields = 0;
@@ -99,16 +99,16 @@
check_chars = SIZE_MAX;
output_unique = output_first_repeated = true;
output_later_repeated = false;
-@@ -511,7 +533,7 @@
+@@ -512,7 +534,7 @@
if (optc == -1
|| (posixly_correct && nfiles != 0)
|| ((optc = getopt_long (argc, argv,
-- "-0123456789Dcdf:is:uw:z", longopts, NULL))
-+ "-0123456789Dcdf:im:s:uw:z", longopts, NULL))
+- "-0123456789Dcdf:is:uw:z",
++ "-0123456789Dcdf:im:s:uw:z",
+ longopts, nullptr))
== -1))
{
- if (argc <= optind)
-@@ -605,6 +627,11 @@
+@@ -607,6 +629,11 @@
ignore_case = true;
break;