diff options
author | Pádraig Brady <P@draigBrady.com> | 2014-12-16 12:36:39 +0000 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2014-12-19 11:56:20 +0000 |
commit | 6894816c653adef54f3a85becbf75a865d6d39d6 (patch) | |
tree | 82bb3126d3c8cfaeebc950bd03a52a4f5e0f056c /src/stty.c | |
parent | 178f8e79dcd1e0b8bbb3b04da664d05eaae56186 (diff) | |
download | coreutils-6894816c653adef54f3a85becbf75a865d6d39d6.tar.xz |
diagnose too-large numbers better
Following on from commit v8.23-82-gaddae94, consistently diagnose
numbers that are too large, so as to distinguish from other errors,
and make the limits obvious.
* gl/modules/xdectoint: A new module implementing xdecto[iu]max(),
which handles the common case of parsing a bounded integer and
exiting with a diagnostic on error.
* gl/lib/xdectoimax.c: The signed variant.
* gl/lib/xdectoint.c: The parameterized implementation.
* gl/lib/xdectoint.h: The interface.
* gl/lib/xdectoumax.c: The unsigned variant.
* bootstrap.conf: Reference the new module.
* cfg.mk (exclude_file_name_regexp--sc_require_config_h_first):
Exclude the parameterized templates.
* src/csplit.c: Output EOVERFLOW or ERANGE errors if appropriate.
* src/fmt.c: Likewise.
* src/fold.c: Likewise.
* src/head.c: Likewise.
* src/ls.c: Likewise.
* src/nl.c: Likewise.
* src/nproc.c: Likewise.
* src/shred.c: Likewise.
* src/shuf.c: Likewise.
* src/stdbuf.c: Likewise.
* src/stty.c: Likewise.
* src/tail.c: Likewise.
* src/truncate.c: Likewise.
* src/split.c: Likewise.
* src/pr.c: Likewise.
* tests/pr/pr-tests.pl: Adjust to avoid matching errno diagnostic.
* tests/fmt/base.pl: Likewise.
* tests/split/l-chunk.sh: Likewise.
* tests/misc/shred-negative.sh: Likewise.
* tests/misc/tail.pl: Likewise. Also remove the redundant
existing ERR_SUBST from test err-6.
* tests/ls/hex-option.sh: Check HEX/OCT options.
* tests/misc/shred-size.sh: Likewise.
* tests/misc/stty-row-col.sh: Likewise.
Diffstat (limited to 'src/stty.c')
-rw-r--r-- | src/stty.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/stty.c b/src/stty.c index 42ec3b447..41909b75e 100644 --- a/src/stty.c +++ b/src/stty.c @@ -58,6 +58,7 @@ #include "error.h" #include "fd-reopen.h" #include "quote.h" +#include "xdectoint.h" #include "xstrtol.h" /* The official name of this program (e.g., no 'g' prefix). */ @@ -2087,11 +2088,5 @@ visible (cc_t ch) static unsigned long int integer_arg (const char *s, unsigned long int maxval) { - unsigned long int value; - if (xstrtoul (s, NULL, 0, &value, "bB") != LONGINT_OK || maxval < value) - { - error (0, 0, _("invalid integer argument %s"), quote (s)); - usage (EXIT_FAILURE); - } - return value; + return xnumtoumax (s, 0, 0, maxval, "bB", _("invalid integer argument"), 0); } |