diff options
author | Jim Meyering <meyering@redhat.com> | 2008-04-26 09:28:48 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-05-06 08:21:28 +0200 |
commit | 209850fd7e1e89cf8937310878bd22d70e3588a5 (patch) | |
tree | 4f124f7243ad25afb4ca6a2f2fab081a927a3016 /tests | |
parent | 4d3bf408b9a308a4702ac93546446927c12cc101 (diff) | |
download | coreutils-209850fd7e1e89cf8937310878bd22d70e3588a5.tar.xz |
avoid problems with sign-extended "char" operand to is* functions
* src/cut.c (set_fields): Apply to_uchar to isblank operands.
* src/uniq.c (find_field): Likewise.
* src/seq.c (scan_arg): Likewise, for isspace.
* tests/misc/uniq: New file. Test for the above, but only
when isspace(0240).
* tests/Makefile.am (TESTS): Add misc/uniq.
* configure.ac: Use gt_LOCALE_FR.
* tests/check.mk (TESTS_ENVIRONMENT): Propagate LOCALE_FR to scripts.
* NEWS: Mention the bug fixes.
Before this patch, on FreeBSD 6:
$ printf 'x y z\nx \xa0 y z\n' > in
$ LC_ALL=fr_FR.UTF-8 uniq -f2 in|tr ' ' .
x.y.z
x. .y.z
With the patch:
$ LC_ALL=fr_FR.UTF-8 uniq -f2 in|tr ' ' .
x.y.z
This also affected many other locales:
for i in $(locale -a); do test $(LC_ALL=$i ./uniq -f1 in|wc -l)
= $(LC_ALL=$i uniq -f1 in|wc -l) || echo $i ; done
...
en_GB.ISO8859-1
en_GB.ISO8859-15
en_GB.UTF-8
en_IE.UTF-8
en_NZ.ISO8859-1
en_NZ.ISO8859-15
en_NZ.UTF-8
en_US.ISO8859-1
en_US.ISO8859-15
en_US.UTF-8
...
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tests/check.mk | 1 | ||||
-rwxr-xr-x | tests/misc/uniq | 58 |
3 files changed, 60 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 343d71948..515cfe6fe 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -211,6 +211,7 @@ TESTS = \ misc/tsort \ misc/tty-eof \ misc/unexpand \ + misc/uniq \ chmod/c-option \ chmod/equal-x \ chmod/equals \ diff --git a/tests/check.mk b/tests/check.mk index f62661ca0..abe03afcf 100644 --- a/tests/check.mk +++ b/tests/check.mk @@ -45,6 +45,7 @@ built_programs = \ # Append this, because automake does the same. TESTS_ENVIRONMENT = \ + LOCALE_FR='$(LOCALE_FR)' \ abs_top_builddir='$(abs_top_builddir)' \ abs_top_srcdir='$(abs_top_srcdir)' \ built_programs="`$(built_programs)`" \ diff --git a/tests/misc/uniq b/tests/misc/uniq new file mode 100755 index 000000000..6587844ce --- /dev/null +++ b/tests/misc/uniq @@ -0,0 +1,58 @@ +#!/bin/sh +# Test for a subtle, system-and-locale-dependent bug in uniq. + +# Copyright (C) 2008 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/>. + +case $LOCALE_FR in +''|none) echo "$0: skipping this test -- no appropriate locale" 1>&2; exit 77;; +esac + +: ${srcdir=.} +. $top_srcdir/tests/require-perl + +me=`echo $0|sed 's,.*/,,'` +exec $PERL -w -I$top_srcdir/tests -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF +require 5.003; +use strict; + +my $prog = 'uniq'; + +# Turn off localization of executable's output. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +# I've only ever triggered the problem in a non-C locale. +my $locale = $ENV{LOCALE_FR}; + +# See if isblank returns true for nbsp. +my $x = `env printf '\xa0'| LC_ALL=$locale tr '[:blank:]' x`; +# If so, expect just one line of output in the schar test. +# Otherwise, expect two. +my $in = " y z\n\xa0 y z\n"; +my $schar_exp = $x eq 'x' ? " y z\n" : $in; + +my @Tests = + ( + ['schar', '-f1', {IN => $in}, {OUT => $schar_exp}, + {ENV => "LC_ALL=$locale"}, + ], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $fail = run_tests ($prog, $prog, \@Tests, $save_temps, $verbose); +exit $fail; +EOF |