Mirror of https://https.git.savannah.gnu.org/git/coreutils.git/ https://git.shady.money/coreutils/atom?h=v8.7 2010-10-14T09:39:14Z 2010-10-14T09:39:14Z Paul Eggert eggert@cs.ucla.edu 2010-10-14T07:12:23Z urn:sha1:6b9ab1831f7b05883ed1797a5c71cf5c594b6124 * src/sort.c (key_warnings): Local buffer should be of size INT_BUFSIZE_BOUND (uintmax_t), not INT_BUFSIZE_BOUND (sword). This bug was discovered by running 'make check' on a 32-bit Solaris 8 sparc host, using Sun cc. I saw several other instances of invoking umaxtostr on a buffer declared to be of size INT_BUFSIZE_BOUND (VAR), and these instances should at some point be replaced by INT_BUFSIZE_BOUND (uintmax_t) too, as that's a less error-prone style. 2010-10-14T05:41:13Z Paul Eggert eggert@cs.ucla.edu 2010-10-14T03:35:50Z urn:sha1:34ef0a01f0e1d620dac17d35832449b6880641b0 * src/sort.c (fold_toupper): Change this back from char to unsigned char, fixing a portability issue introduced in commit 59e2e55d0f154a388adc9bac37d2b45f2ba971f8 dated February 26, as the C Standard doesn't let you convert from unsigned char * to char * without a cast, and the (in theory more portable) style here is to convert char values, not pointer values. (getmonth): Convert char to unsigned char when needed for comparison. 2010-09-20T22:45:49Z Paul Eggert eggert@cs.ucla.edu 2010-09-20T22:44:31Z urn:sha1:9065006ccbe0a94e9536950f389a0cbc3dfb4dda * src/sort.c (sortlines, sort): Use pthread_spin_destroy when a spin lock is no longer used. This isn't needed on GNU/Linux or Solaris, but POSIX says it may free up resources on some platforms. 2010-08-11T03:25:56Z Paul Eggert eggert@cs.ucla.edu 2010-08-11T03:25:20Z urn:sha1:9899e6cd853baf2704fdb52e55270ffbabd37dff This change was prompted by the previous one: I audited the code looking for similar examples. Too bad valgrind doesn't catch this. * src/sort.c (check, mergefps): xrealloc -> free + xmalloc * src/who.c (print_user): Likewise. 2010-08-10T20:49:57Z Paul Eggert eggert@cs.ucla.edu 2010-08-10T20:49:41Z urn:sha1:2050a5913b0ee2e08de22db29340865f7f0ee608 * src/sort.c (compare_random): Use free/xmalloc rather than xrealloc, since the old buffer contents need not be preserved. Also, don't fail if the guessed-sized malloc fails. Suggested by Bruno Haible. 2010-08-10T15:11:15Z Jim Meyering meyering@redhat.com 2010-08-10T15:11:15Z urn:sha1:ec0d6ddb813e95a01421b45f1743713e88175448 * src/sort.c: Include "ignore-value.h". (debug_key): Use ignore_value. 2010-08-09T06:15:09Z Paul Eggert eggert@cs.ucla.edu 2010-08-09T06:14:38Z urn:sha1:ad31a59a370e29f38864a747045da10c82d6c912 * src/sort.c (compare_random): Guess that the output will be 3X the input. This avoids the overhead of calling strxfrm twice on typical implementations. Suggested by Bruno Haible. 2010-08-07T04:30:50Z Paul Eggert eggert@cs.ucla.edu 2010-08-07T04:30:17Z urn:sha1:b877ea4b3ee4c62ab75caedbfdcca4877961aedf * NEWS: Document this. * src/sort.c (getmonth): Omit LEN arg, as MONTH is now null-terminated. (compare_random): Don't null-terminate keys, as caller now does that. (compare_version): Remove. (debug_key): Null-terminate string for getmonth. (keycompare): Support combining -R with any of -d, -f, -i, -V. Also, support combining -V with any of -d, -i. (check_ordering_compatibility): Allow newly-supported combinations. * tests/misc/sort (02q, 02r, 02s): New tests, for new combinations. (incompat2): Now test -nR, since -fR are now compatible. 2010-08-05T20:28:54Z Paul Eggert eggert@cs.ucla.edu 2010-08-05T20:28:35Z urn:sha1:bdde34f95858e6ec3e6912055da3df0b033a1518 Formerly, the 'compare' function and some of its subroutines had a debugging flag, which caused them to output underlines. This change refactors the code so that debugging output is more-separated from the actual sorting. In the process, the change fixes a minor error in the debugging output. The change shortens the source code and executable size a tad, and improves CPU performance by 2.4% on my platform with a simple benchmark (C locale, line sorting, no debug). * src/sort.c (long_double, strtold): Move back to prelude, since they're now used by multiple functions again. (unit_order): Move to file scope, since it's now used by two functions. (find_unit_order, human_numcompare, numcompare, general_numcompare): Remove endptr parameter. All callers changed. (human_numcompare): Args are now const pointers. (getmonth): Endptr is now non-const. (key_numeric): Move up, since it's needed earlier. (debug_key): Take a line and a key as argument, instead of having the caller figure out where the field is. (debug_line): New function. (keycompare, compare): Omit debug parameter; debug output now done elsewhere. All callers changed. (write_line): Renamed from write_bytes; all callers changed. Use debug_line (not 'compare') to output debug info. Use a slightly faster check for whether output file is stdout. (check): Don't do debugging output; it's not that useful here, and it confuses the code. (main): Check for incompatibility between -c and --debug. Use standard diagnostic for incompatible options. * tests/misc/sort-debug-keys: Fix test case: "--Mi-1" is not a number, so its first character should not be underlined when debugging a numeric sort. 2010-08-04T23:10:59Z Paul Eggert eggert@cs.ucla.edu 2010-08-04T23:10:10Z urn:sha1:2b49b140cc13cf36ec5ee5acaca5ac7bfeed6366 * lib/Makefile.am (libcoreutils_a_SOURCES): Remove xmemxfrm.c, xmemxfrm.h. * lib/memxfrm.c, lib/memxfrm.h, lib/xmemxfrm.c, lib/xmemxfrm.h: Remove. * m4/memxfrm.m4: Likewise. * m4/prereq.m4 (gl_PREREQ): Remove gl_MEMXFRM. * po/POTFILES.in: Remove lib/xmemxfrm.c. * src/sort.c: Don't include xmemxfrm.h. (cmp_hashes): Remove. (xstrxfrm): New function. (compare_random): If a line contains NULs, don't create a big buffer that contains the strxfrm output of each string in the line. Instead, accumulate checksums and differences as we go, so that at any one time we have to store at most the output of a single strxfrm call when processing the line. This removes the need for an memxfrm function.