head: support counts > 2**64

* src/head.c (head): Optimize for -n-HUGE, where HUGE exceeds
2**64 - 2.
(string_to_integer): Return UINTMAX_MAX for too-large numbers,
instead of failing.
(main): Omit no-lnger-necessary test for byte count overflow.

diff --git a/NEWS b/NEWS
index 2da258c9dd9459445db8b7e64a29b273b9002731..725064c9d463713229206497efc6a93858c0fbd2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,9 @@ GNU coreutils NEWS                                    -*- outline -*-
 
 ** Improvements
 
+  'head -c NUM' and 'head -n NUM' no longer fail merely because NUM
+  stands for 2**64 or more.
+
   sort operates more efficiently when used on pseudo files with
   an apparent size of 0, like those in /proc.
 

diff --git a/src/head.c b/src/head.c
index 9feda5653cc2111a7414f4817b93f9ab317e90be..2795ae486f88155434e60df3b7bac099085e3f19 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -487,7 +487,7 @@ elide_tail_bytes_file (char const *filename, int fd, uintmax_t n_elide,
 }
 
 /* For an input file with name FILENAME and descriptor FD,
-   output all but the last N_ELIDE_0 bytes.
+   output all but the last N_ELIDE bytes.
    If CURRENT_POS is nonnegative, the input file is positioned there
    and should be repositioned to just before the elided bytes.
    Buffer the specified number of lines as a linked list of LBUFFERs,
@@ -841,6 +841,10 @@ head (char const *filename, int fd, uintmax_t n_units, bool count_lines,
 
   if (elide_from_end)
     {
+      /* Optimize for "infinite" elisions.  */
+      if (n_units == UINTMAX_MAX)
+        return true;
+
       off_t current_pos = -1;
       struct stat st;
       if (fstat (fd, &st) != 0)
@@ -903,15 +907,18 @@ head_file (char const *filename, uintmax_t n_units, bool count_lines,
 /* Convert a string of decimal digits, N_STRING, with an optional suffix
    to an integral value.  Upon successful conversion,
    return that value.  If it cannot be converted, give a diagnostic and exit.
+   If it is too large, silently return UINTMAX_MAX.
    COUNT_LINES indicates whether N_STRING is a number of bytes or a number
    of lines.  It is used solely to give a more specific diagnostic.  */
 
 static uintmax_t
 string_to_integer (bool count_lines, char const *n_string)
 {
-  return xdectoumax (n_string, 0, UINTMAX_MAX, "bkKmMGTPEZYRQ0",
-                     count_lines ? _("invalid number of lines")
-                                 : _("invalid number of bytes"), 0);
+  return xnumtoumax (n_string, 10, 0, UINTMAX_MAX, "bkKmMGTPEZYRQ0",
+                     (count_lines
+                      ? _("invalid number of lines")
+                      : _("invalid number of bytes")),
+                     0, XTOINT_MAX_QUIET);
 }
 
 int
@@ -922,7 +929,8 @@ main (int argc, char **argv)
   int c;
   size_t i;
 
-  /* Number of items to print. */
+  /* Number of items to output, or to elide from the end.
+     UINTMAX_MAX stands for an essentially unlimited number.  */
   uintmax_t n_units = DEFAULT_NUMBER;
 
   /* If true, interpret the numeric argument as the number of lines.
@@ -1073,13 +1081,6 @@ main (int argc, char **argv)
       || (header_mode == multiple_files && optind < argc - 1))
     print_headers = true;
 
-  if ( ! count_lines && elide_from_end && OFF_T_MAX < n_units)
-    {
-      char umax_buf[INT_BUFSIZE_BOUND (n_units)];
-      error (EXIT_FAILURE, EOVERFLOW, "%s: %s", _("invalid number of bytes"),
-             quote (umaxtostr (n_units, umax_buf)));
-    }
-
   file_list = (optind < argc
                ? (char const *const *) &argv[optind]
                : default_file_list);