diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-12-13 22:03:54 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-12-13 22:03:54 +0100 |
| commit | ec95137cc376119f634610a7683a296fc7b78ea4 (patch) | |
| tree | 52d315f085e18022db44722d7e58f3e4635d84d9 /tests/join | |
| parent | ae3ee95eb8372ec5947e3c790c6ea77bc703c160 (diff) | |
| download | coreutils-ec95137cc376119f634610a7683a296fc7b78ea4.tar.xz | |
Remove some arbitrary restrictions on size fields,
so that commands like "sort -k 18446744073709551616" no longer fail merely
because 18446744073709551616 doesn't fit in uintmax_t. The trick is that
these fields can all be treated as effectively infinity; their exact
values don't matter, since no internal buffer can be that long.
* src/join.c (string_to_join_field): Verify that SIZE_MAX <= ULONG_MAX
if the code assumes this. Silently truncate too-large values to SIZE_MAX,
as the remaining code will do the right thing in this case.
* src/sort.c (parse_field_count): Likewise.
* src/uniq.c (size_opt, main): Likewise.
* tests/join/Test.pm (bigfield): New test.
* tests/sort/Test.pm (bigfield): New test.
* tests/uniq/Test.pm (121): New test.
Signed-off-by: Jim Meyering <jim@meyering.net>
Diffstat (limited to 'tests/join')
| -rw-r--r-- | tests/join/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/join/Test.pm | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am index 54ce115b5..151d2fea3 100644 --- a/tests/join/Makefile.am +++ b/tests/join/Makefile.am @@ -30,14 +30,15 @@ maint_gen = 1a.I1 1a.I2 1a.X 1b.I1 1b.I2 1b.X 1c.I1 1c.I2 1c.X 1d.I1 1d.I2 \ 5k.I2 5k.X 5l.I1 5l.I2 5l.X 5m.I1 5m.I2 5m.X 6a.I1 6a.I2 6a.X 6b.I1 6b.I2 \ 6b.X 6c.I1 6c.I2 6c.X 7a.I1 7a.I2 7a.X 8a.I1 8a.I2 8a.X 8b.I1 8b.I2 8b.X \ 9a.I1 9a.I2 9a.X trailing-sp.I1 trailing-sp.I2 trailing-sp.X sp-vs-blank.I1 \ -sp-vs-blank.I2 sp-vs-blank.X 8-bit-t.I1 8-bit-t.I2 8-bit-t.X invalid-j.X +sp-vs-blank.I2 sp-vs-blank.X 8-bit-t.I1 8-bit-t.I2 8-bit-t.X bigfield.I1 \ +bigfield.I2 bigfield.X invalid-j.X run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 2a.O \ 2a.E 2b.O 2b.E 2c.O 2c.E 3a.O 3a.E 4a.O 4a.E 4b.O 4b.E 4c.O 4c.E 4d.O 4d.E \ 4e.O 4e.E 5a.O 5a.E 5b.O 5b.E 5c.O 5c.E 5d.O 5d.E 5e.O 5e.E 5f.O 5f.E 5g.O \ 5g.E 5h.O 5h.E 5i.O 5i.E 5j.O 5j.E 5k.O 5k.E 5l.O 5l.E 5m.O 5m.E 6a.O 6a.E \ 6b.O 6b.E 6c.O 6c.E 7a.O 7a.E 8a.O 8a.E 8b.O 8b.E 9a.O 9a.E trailing-sp.O \ -trailing-sp.E sp-vs-blank.O sp-vs-blank.E 8-bit-t.O 8-bit-t.E invalid-j.O \ -invalid-j.E +trailing-sp.E sp-vs-blank.O sp-vs-blank.E 8-bit-t.O 8-bit-t.E bigfield.O \ +bigfield.E invalid-j.O invalid-j.E ##test-files-end EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) diff --git a/tests/join/Test.pm b/tests/join/Test.pm index 37b1449ac..3d60ce3dc 100644 --- a/tests/join/Test.pm +++ b/tests/join/Test.pm @@ -136,6 +136,9 @@ my @tv = ( [t_subst "a:1\nb:1\n", t_subst "a:2:\nb:2:\n"], t_subst "a:1:2:\nb:1:2:\n", 0], +['bigfield', '-1 340282366920938463463374607431768211456 -2 2', + ["a\n", "b\n"], " a b\n", 0], + # FIXME: change this to ensure the diagnostic makes sense ['invalid-j', '-j x', {}, "", 1], |