mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-03-04 12:05:23 +02:00
59e2e55d0f
* 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.
39 lines
1.3 KiB
Bash
Executable File
39 lines
1.3 KiB
Bash
Executable File
#!/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
|