From 59e2e55d0f154a388adc9bac37d2b45f2ba971f8 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Fri, 26 Feb 2010 15:33:16 +0000 Subject: sort: fix issues with month sorting in some locales MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * src/sort.c (char fold_toupper[]): Change to unsigned so as the correct comparisons are made in getmonth(). This fixes unibyte locales where abbreviated months have characters that are > 0x7F, but it also works for multibyte locales with the caveat that multibyte characters are matched case sensitively. With this change, the following example sorts correctly: $ echo -e "1 márta\n2 Feabhra" | LANG=ga_IE.utf8 sort -k2,2M 2 Feabhra 1 márta * src/sort.c (inittables): Since we ignore blanks around months in the input, don't include them when they're present in the locale. With this change, the following example sorts correctly: $ echo -e "1 2月\n2 1月" | LANG=ja_JP.utf8 sort -k2,2M 2 1月 1 2月 * tests/misc/sort-month: A new test to exercise the above cases. * tests/Makefile.am: Reference the new test. * NEWS: Mention the fix. --- src/sort.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/sort.c b/src/sort.c index 481fdb8bb..39cb6d6f2 100644 --- a/src/sort.c +++ b/src/sort.c @@ -209,7 +209,7 @@ static bool nonprinting[UCHAR_LIM]; static bool nondictionary[UCHAR_LIM]; /* Translation table folding lower case to upper. */ -static char fold_toupper[UCHAR_LIM]; +static unsigned char fold_toupper[UCHAR_LIM]; #define MONTHS_PER_YEAR 12 @@ -1129,7 +1129,7 @@ inittables (void) { char const *s; size_t s_len; - size_t j; + size_t j, k; char *name; s = (char *) nl_langinfo (ABMON_1 + i); @@ -1137,9 +1137,10 @@ inittables (void) monthtab[i].name = name = xmalloc (s_len + 1); monthtab[i].val = i + 1; - for (j = 0; j < s_len; j++) - name[j] = fold_toupper[to_uchar (s[j])]; - name[j] = '\0'; + for (j = k = 0; j < s_len; j++) + if (! isblank (to_uchar (s[j]))) + name[k++] = fold_toupper[to_uchar (s[j])]; + name[k] = '\0'; } qsort ((void *) monthtab, MONTHS_PER_YEAR, sizeof *monthtab, struct_month_cmp); -- cgit v1.2.3-70-g09d2