5c13ab41b
Bartosz Golaszewski
2014-01-19
Subject
sort: check global flags on fallback sort
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/sort.c+6 -2
| @@ -302,10 +302,14 @@ static int compare_keys(const void *xarg, const void *yarg) | |
| } /* for */ | |
| /* Perform fallback sort if necessary */ | |
| - | if (!retval && !(option_mask32 & FLAG_s)) |
| + | if (!retval && !(option_mask32 & FLAG_s)) { |
| retval = strcmp(*(char **)xarg, *(char **)yarg); | |
| + | flags = option_mask32; |
| + | } |
| + | |
| + | if (flags & FLAG_r) |
| + | return -retval; |
| - | if (flags & FLAG_r) return -retval; |
| return retval; | |
| } | |
testsuite/sort.tests+0 -3
| @@ -47,8 +47,6 @@ egg 1 2 papyrus | |
| 999 3 0 algebra | |
| " "$data" "" | |
| - | test x"$SKIP_KNOWN_BUGS" = x"" && { |
| - | # Busybox is definitely doing these wrong. FIXME |
| testing "sort key range with numeric option and global reverse" \ | |
| "sort -k2,3n -r input" \ | |
| "egg 1 2 papyrus | |
| @@ -65,7 +63,6 @@ testing "sort key range with multiple options" "sort -k2,3rn input" \ | |
| 42 1 3 woot | |
| egg 1 2 papyrus | |
| " "$data" "" | |
| - | } |
| testing "sort key range with two -k options" "sort -k 2,2n -k 1,1r input" "\ | |
| d 2 | |