diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-19 19:27:26 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-19 19:27:26 +0200 |
| commit | 0506e292b518a04846ae1f611ecc0633969a2801 (patch) | |
| tree | 14dfac41239a1a67fdd4d895b0b27d1ba77fd383 | |
| parent | d1ed3e68b8080161642cc106099c0a17ac7892e6 (diff) | |
| download | busybox-0506e292b518a04846ae1f611ecc0633969a2801.tar.gz | |
sort: fix ENDCHAR handling in "-kSTART,N.ENDCHAR"
function old new delta
get_key 505 503 -2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/sort.c | 7 | ||||
| -rwxr-xr-x | testsuite/sort.tests | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/coreutils/sort.c b/coreutils/sort.c index f2bc5335f..07d903388 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -160,17 +160,18 @@ static char *get_key(char *str, struct sort_key *key, int flags) if (!j) start = end; } /* Strip leading whitespace if necessary */ -//XXX: skip_whitespace() if (flags & FLAG_b) + /* not using skip_whitespace() for speed */ while (isspace(str[start])) start++; /* Strip trailing whitespace if necessary */ if (flags & FLAG_bb) while (end > start && isspace(str[end-1])) end--; - /* Handle offsets on start and end */ + /* -kSTART,N.ENDCHAR: honor ENDCHAR (1-based) */ if (key->range[3]) { - end += key->range[3] - 1; + end = key->range[3]; if (end > len) end = len; } + /* -kN.STARTCHAR[,...]: honor STARTCHAR (1-based) */ if (key->range[1]) { start += key->range[1] - 1; if (start > len) start = len; diff --git a/testsuite/sort.tests b/testsuite/sort.tests index 39c7af738..c51a8e475 100755 --- a/testsuite/sort.tests +++ b/testsuite/sort.tests @@ -106,6 +106,14 @@ a/a:a a:b " "" +testing "sort with ENDCHAR" "sort -t. -k1,1.1 -k2 input" "\ +ab.1 +aa.2 +" "\ +aa.2 +ab.1 +" "" + testing "glibc build sort" "sort -t. -k 1,1 -k 2n,2n -k 3 input" "\ GLIBC_2.1 GLIBC_2.1.1 |