final (?) fix for locale problem (RT #41285)

Instead of testing the value of the env variables, use POSIX::setlocale to get the effective value of the LC_CTYPE locale (the only one effecting tr operation). For the workaround on top of the script, add also LC_CTYPE to the list of env variables explicitely set to C. Also, setting the env variables must happen in a BEGIN{} block, otherwise things are too late.
eserte · Apr 2, 2013 · b7f034a · b7f034a
1 parent c3b88c9
commit b7f034a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/t/exec.t b/t/exec.t
@@ -31,8 +31,12 @@ require "filter-util.pl" ;
 use vars qw( $Inc $Perl $script ) ;
 
 $script = '';
-if (exists $ENV{LANG} and $ENV{LANG} !~ /^C|en/) { # CPAN #41285
-  $script = q($ENV{LANG}='C'; $ENV{LC_ALL}='C';);
+if (eval {
+    require POSIX;
+    my $val = POSIX::setlocale(&POSIX::LC_CTYPE);
+    $val !~ m{^(C|en)}
+}) { # CPAN #41285
+  $script = q(BEGIN { $ENV{LANG}=$ENV{LC_ALL}=$ENV{LC_CTYPE}='C'; });
 }
 
 $script .= <<'EOF' ;

diff --git a/t/sh.t b/t/sh.t
@@ -31,8 +31,12 @@ require "filter-util.pl" ;
 use vars qw( $Inc $Perl $script ) ;
 
 $script = '';
-if (exists $ENV{LANG} and $ENV{LANG} !~ /^C|en/) { # CPAN #41285
-  $script = q($ENV{LANG}='C'; $ENV{LC_ALL}='C';);
+if (eval {
+    require POSIX;
+    my $val = POSIX::setlocale(&POSIX::LC_CTYPE);
+    $val !~ m{^(C|en)}
+}) { # CPAN #41285
+  $script = q(BEGIN { $ENV{LANG}=$ENV{LC_ALL}=$ENV{LC_CTYPE}='C'; });
 }
 
 $script .= <<"EOF" ;