bekucera/coreutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/coreutils.git synced 2025-09-10 07:59:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

tail: allow >=2**64 in traditional form

Browse Source 
This better matches the treatment of POSIX form,
e.g., ‘tail +Nc’ is now like ‘tail -c +N’ even when N is large.
* src/tail.c: Don’t include xstrtol.h.
(parse_obsolete_option): Treat numbers greater than UINTMAX_MAX as
if they are UINTMAX_MAX.  Parse the number by hand with saturating
arithmetic; nowadays that’s simpler than using xstrtoumax.  There
is no need for a diagnostic now, as the error cannot happen any more.
* tests/tail/tail.pl (obs-plus-c3): New test.
This commit is contained in:
Paul Eggert
2025-07-28 11:24:38 -07:00
parent ae37265727
commit 6439858056
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/tail.c
View File

@@ -47,7 +47,6 @@
#include "xbinary-io.h" #include "xbinary-io.h"
#include "xdectoint.h" #include "xdectoint.h"
#include "xnanosleep.h" #include "xnanosleep.h"
#include "xstrtol.h"
#if HAVE_INOTIFY #if HAVE_INOTIFY
# include "hash.h" # include "hash.h"
@@ -2114,10 +2113,6 @@ tail_file (struct File_spec *f, uintmax_t n_files, uintmax_t n_units)
static bool static bool
parse_obsolete_option (int argc, char * const *argv, uintmax_t *n_units) parse_obsolete_option (int argc, char * const *argv, uintmax_t *n_units)
{ {
char const *p;
char const *n_string;
char const *n_string_end;
int default_count = DEFAULT_N_LINES;
bool t_from_start; bool t_from_start;
bool t_count_lines = true; bool t_count_lines = true;
bool t_forever = false; bool t_forever = false;
@@ -2132,7 +2127,7 @@ parse_obsolete_option (int argc, char * const *argv, uintmax_t *n_units)
int posix_ver = posix2_version (); int posix_ver = posix2_version ();
bool obsolete_usage = posix_ver < 200112; bool obsolete_usage = posix_ver < 200112;
bool traditional_usage = obsolete_usage || 200809 <= posix_ver; bool traditional_usage = obsolete_usage || 200809 <= posix_ver;
p = argv[1]; char const *p = argv[1];
switch (*p++) switch (*p++)
{ {
@@ -2159,14 +2154,16 @@ parse_obsolete_option (int argc, char * const *argv, uintmax_t *n_units)
break; break;
} }
n_string = p; uintmax_t n;
while (c_isdigit (*p)) if (!c_isdigit (*p))
p++; n = DEFAULT_N_LINES;
n_string_end = p; else
for (n = 0; c_isdigit (*p); p++)
n = ckd_mul (&n, n, 10) || ckd_add (&n, n, *p - '0') ? UINTMAX_MAX : n;
switch (*p) switch (*p)
{ {
case 'b': default_count *= 512; FALLTHROUGH; case 'b': n = ckd_mul (&n, n, 512) ? UINTMAX_MAX : n; FALLTHROUGH;
case 'c': t_count_lines = false; FALLTHROUGH; case 'c': t_count_lines = false; FALLTHROUGH;
case 'l': p++; break; case 'l': p++; break;
} }
@@ -2180,13 +2177,7 @@ parse_obsolete_option (int argc, char * const *argv, uintmax_t *n_units)
if (*p) if (*p)
return false; return false;
if (n_string == n_string_end) *n_units = n;
*n_units = default_count;
else if ((xstrtoumax (n_string, nullptr, 10, n_units, "b")
& ~LONGINT_INVALID_SUFFIX_CHAR)
!= LONGINT_OK)
error (EXIT_FAILURE, errno, "%s: %s", _("invalid number"),
quote (argv[1]));
/* Set globals. */ /* Set globals. */
from_start = t_from_start; from_start = t_from_start;

1
tests/tail/tail.pl
View File

@@ -29,6 +29,7 @@ my @tv = (
# #
['obs-plus-c1', '+2c', 'abcd', 'bcd', 0], ['obs-plus-c1', '+2c', 'abcd', 'bcd', 0],
['obs-plus-c2', '+8c', 'abcd', '', 0], ['obs-plus-c2', '+8c', 'abcd', '', 0],
['obs-plus-c3', '+999999999999999999999999999999999999999999c', 'abcd', '', 0],
['obs-c3', '-1c', 'abcd', 'd', 0], ['obs-c3', '-1c', 'abcd', 'd', 0],
['obs-c4', '-9c', 'abcd', 'abcd', 0], ['obs-c4', '-9c', 'abcd', 'abcd', 0],
['obs-c5', '-12c', 'x' . ('y' x 12) . 'z', ('y' x 11) . 'z', 0], ['obs-c5', '-12c', 'x' . ('y' x 12) . 'z', ('y' x 11) . 'z', 0],