diff options
| author | Rob Landley <rob@landley.net> | 2006-06-15 20:50:38 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-06-15 20:50:38 +0000 |
| commit | 39218932b1e99be6ef91329f7fb1beeeb40941c1 (patch) | |
| tree | a2228860af517eefd8787a739e01d00b4062e587 /coreutils | |
| parent | cd82c3c041139c03fceea7e76fb48280b00d73da (diff) | |
| download | busybox-39218932b1e99be6ef91329f7fb1beeeb40941c1.tar.gz | |
Fix bug found by Joey Hess and forwarded by Bastian Bunk. Add Joey Hess's
test case to the testsuite, plus another one that would have been broken by
the first attempt at a fix.
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/sort.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/coreutils/sort.c b/coreutils/sort.c index fb58f6279..3354385a4 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -74,9 +74,7 @@ static char *get_key(char *str, struct sort_key *key, int flags) for(i=1;i<key->range[2*j]+j;i++) { /* Skip leading blanks or first separator */ if(str[end]) { - if(key_separator) { - if(str[end]==key_separator) end++; - } else if(isspace(str[end])) + if(!key_separator && isspace(str[end])) while(isspace(str[end])) end++; } /* Skip body of key */ |