fix for failing fork.t#12 on windows (win32_execvp() tweak in

[p5sagit/p5-mst-13.2.git] / lib / open.pm

diff --git a/lib/open.pm b/lib/open.pm
index 8eff354..441fc8c 100644 (file)
--- a/lib/open.pm
+++ b/lib/open.pm
@@ -10,9 +10,13 @@ sub in_locale { $^H & $locale::hint_bits }
 
 sub _get_locale_encoding {
     unless (defined $locale_encoding) {
-       eval { use I18N::Langinfo qw(langinfo CODESET) };
+       eval {
+           # I18N::Langinfo isn't available everywhere
+           require I18N::Langinfo;
+           I18N::Langinfo->import('langinfo', 'CODESET');
+       };
        unless ($@) {
-           $locale_encoding = langinfo(CODESET);
+           $locale_encoding = langinfo(CODESET());
        }
        my $country_language;
         if (not $locale_encoding && in_locale()) {
@@ -32,11 +36,11 @@ sub _get_locale_encoding {
        if (defined $locale_encoding &&
            $locale_encoding eq 'euc' &&
            defined $country_language) {
-           if ($country_language =~ /^ja_JP|japan(?:ese)$/i) {
+           if ($country_language =~ /^ja_JP|japan(?:ese)?$/i) {
                $locale_encoding = 'eucjp';
-           } elsif ($country_language =~ /^ko_KR|korea(?:n)$/i) {
+           } elsif ($country_language =~ /^ko_KR|korean?$/i) {
                $locale_encoding = 'euckr';
-           } elsif ($country_language =~ /^zh_TW|taiwan(?:ese)$/i) {
+           } elsif ($country_language =~ /^zh_TW|taiwan(?:ese)?$/i) {
                $locale_encoding = 'euctw';
            }
            croak "Locale encoding 'euc' too ambiguous"
@@ -49,9 +53,7 @@ sub import {
     my ($class,@args) = @_;
     croak("`use open' needs explicit list of disciplines") unless @args;
     $^H |= $open::hint_bits;
-    my ($in,$out) = split(/\0/,(${^OPEN} || '\0'));
-    my @in  = split(/\s+/,$in);
-    my @out = split(/\s+/,$out);
+    my ($in,$out) = split(/\0/,(${^OPEN} || "\0"), -1);
     while (@args) {
        my $type = shift(@args);
        my $discp = shift(@args);
@@ -67,12 +69,15 @@ sub import {
                if ($locale_encoding =~ /^utf-?8$/i) {
                    $layer = "utf8";
                } else {
-                   $layer = "encoding($locale_encoding)";
+                   $layer = "encoding";
                }
            }
            unless(PerlIO::Layer::->find($layer)) {
                carp("Unknown discipline layer '$layer'");
            }
+           if (defined $locale_encoding) {
+               $layer = "$layer($locale_encoding)";
+           }
            push(@val,":$layer");
            if ($layer =~ /^(crlf|raw)$/) {
                $^H{"open_$type"} = $layer;