coreutils/src/sort.c, branch v6.2Mirror of https://https.git.savannah.gnu.org/git/coreutils.git/
https://git.shady.money/coreutils/atom?h=v6.22006-08-08T22:20:12ZUse new random-number interface rather than rand-isaac.c.2006-08-08T22:20:12ZPaul Eggerteggert@cs.ucla.edu2006-08-08T22:20:12Zurn:sha1:f8abf03c3fb0f8abf3d41893922b59bb06daac2e
Don't include rand-isaac.c; include randint.h and randread.h instead.
(RANDOM_SOURCE_OPTION): New enum.
(long_opts, usage, main): New option --random-source.
Include md5.h, randread.h, xmemxfrm.h.
(longopts, usage, main): Remove undocumented --seed option;
it's now replaced by --random-source.
(rand_state, get_hash): Remove.
(randread_source): New static var.
(random_state, cmp_hashes, compare_random): New functions; they guarantee
no collisions in the random hash function.
(keycompare): Use compare_random for -R; don't fall back on comparing
via memcoll, since compare_random does the right thing.
(inittables): Use toupper rather than2006-07-09T17:02:17ZPaul Eggerteggert@cs.ucla.edu2006-07-09T17:02:17Zurn:sha1:1ee1c4d4a33ebc90cb2797175bf11c0e90fda8b2
islower followed by toupper; it's simpler and typically
faster now that we assume at least C89 semantics. Similarly
for tolower.
* src/sort.c (main): Support obsolete usages like "sort +1 -2" even when2006-06-28T23:51:13ZPaul Eggerteggert@cs.ucla.edu2006-06-28T23:51:13Zurn:sha1:4a8016db69e2df36a55c971977102a65ebf2f41e
conforming to POSIX 1003.1-2001, since this is a pure extension to
POSIX.
(usage): Remove mention of --seed.2006-05-25T16:47:43ZPaul Eggerteggert@cs.ucla.edu2006-05-25T16:47:43Zurn:sha1:5002b0ba7930677271bc42a2e291779a3e02bc62(incompatible_options): New function.2005-12-14T23:59:23ZPaul Eggerteggert@cs.ucla.edu2005-12-14T23:59:23Zurn:sha1:e18c4ff172e0018df5b2d6abffd4f0e37637d00c
(check_ordering_compatibility, main): Use it.
(main): Check for -c and -o.
Don't bother with a usage message for
"sort -c a b", for consistency with other error diagnostics.
(check_ordering_compatibility): New function.2005-12-14T22:46:02ZPaul Eggerteggert@cs.ucla.edu2005-12-14T22:46:02Zurn:sha1:56805cd20232d0065be1091df04969c5597d75b1
(main): Use it.
Include rand-isaac.c rather than rand-isaac.h.2005-12-12T22:09:27ZPaul Eggerteggert@cs.ucla.edu2005-12-12T22:09:27Zurn:sha1:dee72c1194fc2c277099a72e01827e83ced25257
Don't include md5.h; it wasn't needed.
(struct keyfield): Rename random_hash to random, for consistency
with the other member names. All uses changed.
(usage): Tweak wording to mention STRING for --seed option.
(short_options): Rorder for consistency with other programs.
(rand_state): Now a struct, not a pointer to one. All uses changed.
(HASH_WORDS, HASH_SIZE): Remove.
(get_hash): Remove comments around resbuf size, since we can assume C89.
Use a "more-kosher" (but slower) approach of invoking isaac_refill.
(keycompare): Adjust to the new get_hash.
Add a FIXME.
(badfieldspec): Omit recently-introduced comment; it isn't needed.
(main): Don't set need_random simply because gkey has it set; that
doesn't necessarily mean we'll need random numbers.
Redo seeding to match new get_hash approach.
(get_hash): Change position of `*' in parameter type to conform with convention.2005-12-10T10:04:12ZJim Meyeringjim@meyering.net2005-12-10T10:04:12Zurn:sha1:fbaa8e9719daebbd29587368398bc28e82449a12
(main): Split a long line so it fits in 80 columns.
(keycompare): Remove stray SPACE before TAB that was2005-12-10T09:44:00ZJim Meyeringjim@meyering.net2005-12-10T09:44:00Zurn:sha1:a2b661352b1a5ca4d6796a3aff5d67b9fe2c95bc
causing `make distcheck' to fail.
(short_options, long_options, WORDS, keycompare, main):2005-12-10T08:09:42ZPaul Eggerteggert@cs.ucla.edu2005-12-10T08:09:42Zurn:sha1:569c4876bc3124ffd1abea28e2c869bc5e63e74b
(usage): Add options --random-sort and --seed to implement a random
shuffle.
Include md5.h and rand-isaac.h.
(get_hash): New function.
(rand_state): New var.
(HASH_WORDS, HASH_SIZE): New macros.