Upgrade to Encode 1.42, from Dan Kogai.

p4raw-id: //depot/perl@15965

1 files changed, 17 insertions, 6 deletions

diff --git a/ext/Encode/encoding.pm b/ext/Encode/encoding.pm
index d5b32c7b5b..fd8ae1abac 100644
--- a/ext/Encode/encoding.pm
+++ b/ext/Encode/encoding.pm
@@ -1,5 +1,5 @@
 package encoding;
-our $VERSION = do { my @r = (q$Revision: 1.26 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.28 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 use Encode;
 use strict;
@@ -11,6 +11,16 @@ BEGIN {
     }
 }
 
+our $HAS_PERLIO_ENCODING;
+
+eval { require PerlIO::encoding; };
+if ($@){
+    $HAS_PERLIO_ENCODING = 0;
+}else{
+    $HAS_PERLIO_ENCODING = 1;
+    binmode(STDIN);
+}
+
 sub import {
     my $class = shift;
     my $name  = shift;
@@ -24,9 +34,10 @@ sub import {
     }
     unless ($arg{Filter}){
 	${^ENCODING} = $enc; # this is all you need, actually.
+	$HAS_PERLIO_ENCODING or return 1;
 	for my $h (qw(STDIN STDOUT)){
 	    if ($arg{$h}){
-		unless (defined find_encoding($arg{h})) {
+		unless (defined find_encoding($arg{$h})) {
 		    require Carp;
 		    Carp::croak "Unknown encoding for $h, '$arg{$h}'";
 		}
@@ -46,8 +57,8 @@ sub import {
 	eval {
 	    require Filter::Util::Call ;
 	    Filter::Util::Call->import ;
-	    binmode(STDIN,  ":raw");
-	    binmode(STDOUT, ":raw");
+	    binmode(STDIN);
+	    binmode(STDOUT);
 	    filter_add(sub{
 			   my $status;
                            if (($status = filter_read()) > 0){
@@ -65,8 +76,8 @@ sub import {
 sub unimport{
     no warnings;
     undef ${^ENCODING};
-    binmode(STDIN,  ":raw");
-    binmode(STDOUT, ":raw");
+    binmode(STDIN);
+    binmode(STDOUT);
     if ($INC{"Filter/Util/Call.pm"}){
 	eval { filter_del() };
     }