From 94615d2acfdccbbeb8eb6f8931d0e252b05e1484 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 2 Aug 2010 19:18:01 -0700 Subject: sort: revert recent -h changes and use a more-conservative approach * NEWS: Document changes to sort -h, which are now minor with respect to the pre-July-30th version. * doc/coreutils.texi (sort invocation): Likewise. The documentation now describes how -h comparison is done rather than being vague with border cases. * src/sort.c (long_double, strtold): Move back to general_numcompare. (LD, compute_human): Remove. (find_unit_order): Remove THOU_SEP parameter, since thousands separators are now allowed by all callers. Revert to previous behavior of sorting by suffix, and returning the order rather than 2 * order + binary, since we no longer care whether binary powers are being used. However, treat all zeros the same, instead of sorting 0M before 0G; this is more consistent with the desired behavior of sorting -1G before -1M. * tests/misc/sort (h1, h3, h6): Adjust to match mostly-reverted behavior. However, check that all zeros sort together. * tests/misc/sort-debug-keys: Omit a "_", since the trailing "i" in "1234Gi" is no longer part of the key. --- tests/misc/sort-debug-keys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/misc/sort-debug-keys') diff --git a/tests/misc/sort-debug-keys b/tests/misc/sort-debug-keys index 89f8b9b7d..36b67d27d 100755 --- a/tests/misc/sort-debug-keys +++ b/tests/misc/sort-debug-keys @@ -293,7 +293,7 @@ _____ ^ no match for key ____ ____ - ______ + _____ _____ _____ ______ -- cgit v1.2.3-54-g00ecf