diff options
| author | Erich Eckner <git@eckner.net> | 2016-10-06 11:28:37 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2016-10-06 11:28:37 +0200 |
| commit | d7c6a225ae554f334ce4f2af16f2450c1267f462 (patch) | |
| tree | 18416656e70395c79b9931445cc41cc5981b71bb /core | |
| parent | 7cc58ead864163eab4c9a6570a4b6951c1dd5d56 (diff) | |
| download | crux-patches-d7c6a225ae554f334ce4f2af16f2450c1267f462.tar.xz | |
coreutils uniq: rename option
Diffstat (limited to 'core')
| -rw-r--r-- | core/coreutils/coreutils-uniq.patch.new | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/coreutils/coreutils-uniq.patch.new b/core/coreutils/coreutils-uniq.patch.new index 8b7970c..5f0a9c7 100644 --- a/core/coreutils/coreutils-uniq.patch.new +++ b/core/coreutils/coreutils-uniq.patch.new @@ -5,7 +5,7 @@ static size_t skip_fields; +/* Number of fields to compare. */ -+static size_t max_fields; ++static size_t check_fields; + /* Number of chars to skip after skipping any fields. */ static size_t skip_chars; @@ -14,7 +14,7 @@ {"ignore-case", no_argument, NULL, 'i'}, {"unique", no_argument, NULL, 'u'}, {"skip-fields", required_argument, NULL, 'f'}, -+ {"max-fields", required_argument, NULL, 'm'}, ++ {"check-fields", required_argument, NULL, 'm'}, {"skip-chars", required_argument, NULL, 's'}, {"check-chars", required_argument, NULL, 'w'}, {"zero-terminated", no_argument, NULL, 'z'}, @@ -24,7 +24,7 @@ -i, --ignore-case ignore differences in case when comparing\n\ +"), stdout); + fputs (_("\ -+ -m, --max-fields=N compare no more than N fields\n\ ++ -m, --check-fields=N compare no more than N fields\n\ +"), stdout); + fputs (_("\ -s, --skip-chars=N avoid comparing the first N characters\n\ @@ -43,12 +43,12 @@ i += MIN (skip_chars, size - i); -+ if (max_fields == 0) ++ if (check_fields == 0) + (*len) = size; + else + { + (*len) = i; -+ for (count = 0; count < max_fields && (*len) < size; count ++) ++ for (count = 0; count < check_fields && (*len) < size; count ++) + { + while ((*len) < size && field_sep (lp[*len])) + (*len)++; @@ -95,7 +95,7 @@ skip_chars = 0; skip_fields = 0; -+ max_fields = 0; ++ check_fields = 0; check_chars = SIZE_MAX; output_unique = output_first_repeated = true; output_later_repeated = false; @@ -113,7 +113,7 @@ break; + case 'm': -+ max_fields = size_opt (optarg, ++ check_fields = size_opt (optarg, + N_("invalid number of fields to compare")); + break; + |