diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-08-10 10:51:03 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-08-10 16:48:55 +0200 |
| commit | cd1f4bc1ecde1e7b313c1d0d587a07965d00d8b1 (patch) | |
| tree | 098e699c44e71522d8b9554d027c857eec5f1b5b | |
| parent | b673a5b8ac32a325bb36a9a5a16747520832a456 (diff) | |
| download | coreutils-cd1f4bc1ecde1e7b313c1d0d587a07965d00d8b1.tar.xz | |
sort: don't print uninitialized in diagnostic
* src/sort.c (specify_nmerge): Do use uinttostr value.
Provoke with e.g., sort -m --batch-size=18446744073709551617
Omit quotes around known-numeric value in diagnostic.
* tests/misc/sort-merge [nmerge-big]: Tighten ERR_SUBST regexp
to require a numeric value in that diagnostic, so this particular
failure cannot reappear.
| -rw-r--r-- | src/sort.c | 4 | ||||
| -rwxr-xr-x | tests/misc/sort-merge | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/sort.c b/src/sort.c index 9f998a6a4..74318b900 100644 --- a/src/sort.c +++ b/src/sort.c @@ -1111,12 +1111,12 @@ specify_nmerge (int oi, char c, char const *s) if (e == LONGINT_OVERFLOW) { char max_nmerge_buf[INT_BUFSIZE_BOUND (unsigned int)]; - uinttostr (max_nmerge, max_nmerge_buf); error (0, 0, _("--%s argument %s too large"), long_options[oi].name, quote(s)); error (SORT_FAILURE, 0, _("maximum --%s argument with current rlimit is %s"), - long_options[oi].name, quote (max_nmerge_buf)); + long_options[oi].name, + uinttostr (max_nmerge, max_nmerge_buf)); } else xstrtol_fatal (e, oi, c, long_options, s); diff --git a/tests/misc/sort-merge b/tests/misc/sort-merge index fb7c63cc1..985d7a414 100755 --- a/tests/misc/sort-merge +++ b/tests/misc/sort-merge @@ -55,9 +55,9 @@ my @Tests = {ERR=>"$prog: invalid --batch-size argument `a'\n"}, {EXIT=>2}], ['nmerge-big', "-m --batch-size=$bigint", @inputs, - {ERR_SUBST=>'s/current rlimit is .+\n/current rlimit is/'}, + {ERR_SUBST=>'s/(current rlimit is) \d+/$1/'}, {ERR=>"$prog: --batch-size argument `$bigint' too large\n". - "$prog: maximum --batch-size argument with current rlimit is"}, + "$prog: maximum --batch-size argument with current rlimit is\n"}, {EXIT=>2}], # This should work since nmerge >= the number of input files |