mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
sort: fix issues with month sorting in some locales
* 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.
This commit is contained in:
1 parent
2590389aab
commit
59e2e55d0f
4 files changed
+50
-5
No files matched your search
@@ -7,6 +7,11 @@ GNU coreutils NEWS -*- outline -*-
|
||||
ls --color once again honors the 'NORMAL' dircolors directive.
|
||||
[bug introduced in coreutils-6.11]
|
||||
|
||||
sort -M now handles abbreviated months that are aligned using blanks
|
||||
in the locale database. Also locales with 8 bit characters are
|
||||
handled correctly, including multi byte locales with the caveat
|
||||
that multi byte characters are matched case sensitively.
|
||||
|
||||
** New features
|
||||
|
||||
join now accepts the --header option, to treat the first line of each
|
||||
|
||||
+6
-5
@@ -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);
|
||||
|
||||
@@ -225,6 +225,7 @@ TESTS = \
|
||||
misc/sort-files0-from \
|
||||
misc/sort-merge \
|
||||
misc/sort-merge-fdlimit \
|
||||
misc/sort-month \
|
||||
misc/sort-rand \
|
||||
misc/sort-version \
|
||||
misc/split-a \
|
||||
|
||||
Executable
+38
@@ -0,0 +1,38 @@
|
||||
#!/bin/sh
|
||||
# Test sorting of abbreviated months from the locale
|
||||
|
||||
# Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
if test "$VERBOSE" = yes; then
|
||||
set -x
|
||||
sort --version
|
||||
fi
|
||||
|
||||
. $srcdir/test-lib.sh
|
||||
|
||||
locale --version >/dev/null 2>&1 ||
|
||||
skip_test_ 'The locale utility is not present'
|
||||
|
||||
# C will be used if the locale is not present
|
||||
for LOC in "$LOCALE_FR" "$LOCALE_FR_UTF8" "ja_JP.utf8"; do
|
||||
mon="$(LC_ALL="$LOC" locale abmon 2>/dev/null);"
|
||||
smon=$(LC_ALL="$LOC" locale abmon 2>/dev/null |
|
||||
tr ';' '\n' | shuf | nl | LC_ALL="$LOC" sort -b -k2,2M |
|
||||
cut -f2 | tr '\n' ';')
|
||||
test "$mon" = "$smon" || { fail=1; break; }
|
||||
done
|
||||
|
||||
Exit $fail
|
||||
Reference in new issue
Block a user