From 6894816c653adef54f3a85becbf75a865d6d39d6 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Tue, 16 Dec 2014 12:36:39 +0000
Subject: 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.
---
 src/nl.c | 46 ++++++++++------------------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

(limited to 'src/nl.c')

diff --git a/src/nl.c b/src/nl.c
index 7fc113442..5c341620a 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -31,7 +31,7 @@
 #include "fadvise.h"
 #include "linebuffer.h"
 #include "quote.h"
-#include "xstrtol.h"
+#include "xdectoint.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "nl"
@@ -497,53 +497,27 @@ main (int argc, char **argv)
             }
           break;
         case 'v':
-          if (xstrtoimax (optarg, NULL, 10, &starting_line_number, "")
-              != LONGINT_OK)
-            {
-              error (0, 0, _("invalid starting line number: %s"),
-                     quote (optarg));
-              ok = false;
-            }
+          starting_line_number = xdectoimax (optarg, INTMAX_MIN, INTMAX_MAX, "",
+                                             _("invalid starting line number"),
+                                             0);
           break;
         case 'i':
-          if (! (xstrtoimax (optarg, NULL, 10, &page_incr, "") == LONGINT_OK
-                 && 0 < page_incr))
-            {
-              error (0, 0, _("invalid line number increment: %s"),
-                     quote (optarg));
-              ok = false;
-            }
+          page_incr = xdectoimax (optarg, 1, INTMAX_MAX, "",
+                                  _("invalid line number increment"), 0);
           break;
         case 'p':
           reset_numbers = false;
           break;
         case 'l':
-          if (! (xstrtoimax (optarg, NULL, 10, &blank_join, "") == LONGINT_OK
-                 && 0 < blank_join))
-            {
-              error (0, 0, _("invalid number of blank lines: %s"),
-                     quote (optarg));
-              ok = false;
-            }
+          blank_join = xdectoimax (optarg, 1, INTMAX_MAX, "",
+                                   _("invalid line number of blank lines"), 0);
           break;
         case 's':
           separator_str = optarg;
           break;
         case 'w':
-          {
-            long int tmp_long;
-            if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK
-                || tmp_long <= 0 || tmp_long > INT_MAX)
-              {
-                error (0, 0, _("invalid line number field width: %s"),
-                       quote (optarg));
-                ok = false;
-              }
-            else
-              {
-                lineno_width = tmp_long;
-              }
-          }
+          lineno_width = xdectoimax (optarg, 1, INT_MAX, "",
+                                     _("invalid line number field width"), 0);
           break;
         case 'n':
           if (STREQ (optarg, "ln"))
-- 
cgit v1.2.3-54-g00ecf