1 files changed, 14 insertions, 40 deletions

diff --git a/src/nl.c b/src/nl.c
index 982f468e..1132af39 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -1,5 +1,5 @@
 /* nl -- number lines of files
-   Copyright (C) 1989-2014 Free Software Foundation, Inc.
+   Copyright (C) 1989-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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"
@@ -178,9 +178,9 @@ Usage: %s [OPTION]... [FILE]...\n\
               program_name);
       fputs (_("\
 Write each FILE to standard output, with line numbers added.\n\
-With no FILE, or when FILE is -, read standard input.\n\
 "), stdout);
 
+      emit_stdin_note ();
       emit_mandatory_arg_note ();
 
       fputs (_("\
@@ -223,7 +223,7 @@ FORMAT is one of:\n\
   rz   right justified, leading zeros\n\
 \n\
 "), stdout);
-      emit_ancillary_info ();
+      emit_ancillary_info (PROGRAM_NAME);
     }
   exit (status);
 }
@@ -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"))
@@ -612,5 +586,5 @@ main (int argc, char **argv)
   if (have_read_stdin && fclose (stdin) == EOF)
     error (EXIT_FAILURE, errno, "-");
 
-  exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+  return ok ? EXIT_SUCCESS : EXIT_FAILURE;
 }