Integrate mainline

p4raw-id: //depot/perlio@19868

diff --cc MANIFEST
Simple merge

diff --cc ext/Encode/Encode.xs
Simple merge

diff --cc lib/FileCache/t/01open.t
index 0000000,dfbb7b0..d516aea
mode 000000,100644..100644
--- /dev/null
--- 2/lib/FileCache/t/01open.t
+++ b/lib/FileCache/t/01open.t
@@@ -1,0 -1,26 +1,26 @@@
 -    @files = qw(foo bar baz quux Foo_Bar);
+ #!./perl
+ use FileCache;
+ use vars qw(@files);
+ BEGIN {
++    @files = qw(foo bar baz quux Foo'Bar);
+     chdir 't' if -d 't';
+ 
+     #For tests within the perl distribution
+     @INC = '../lib' if -d '../lib';
+     END;
+ }
+ END{
+   unlink @files;
+ }
+ 
+ 
+ print "1..1\n";
+ 
+ {# Test 1: that we can open files
+      for my $path ( @files ){
+        cacheout $path;
+        print $path "$path 1\n";
+      }
+      print "not " unless scalar map({ -f } @files) == scalar @files;
+      print "ok 1\n";
+ }

diff --cc lib/FileCache/t/03append.t
index 0000000,07edb7a..5a08a1e
mode 000000,100644..100644
--- /dev/null
--- 2/lib/FileCache/t/03append.t
+++ b/lib/FileCache/t/03append.t
@@@ -1,0 -1,47 +1,47 @@@
 -    @files = qw(foo bar baz quux Foo_Bar);
+ #!./perl
+ use FileCache maxopen=>2;
+ use vars qw(@files);
+ BEGIN {
++    @files = qw(foo bar baz quux Foo'Bar);
+     chdir 't' if -d 't';
+ 
+     #For tests within the perl distribution
+     @INC = '../lib' if -d '../lib';
+     END;
+ }
+ END{
+   unlink @files;
+ }
+ 
+ print "1..2\n";
+ 
+ {# Test 3: that we open for append on second viewing
+      my @cat;
+      for my $path ( @files ){
+        cacheout $path;
+        print $path "$path 3\n";
+      }
+      for my $path ( @files ){
+        cacheout $path;
+        print $path "$path 33\n";
+      }
+      for my $path ( @files ){
+        open($path, '<', $path);
+        push @cat, do{ local $/; <$path>};
+          close($path);
+      }
+      print 'not ' unless scalar grep(/\b3$/m, @cat) == scalar @files;
+      print "ok 1\n";
+      @cat = ();
+      for my $path ( @files ){
+        cacheout $path;
+        print $path "$path 333\n";
+      }
+      for my $path ( @files ){
+        open($path, '<', $path);
+        push @cat, do{ local $/; <$path>};
+          close($path);
+      }
+      print 'not ' unless scalar grep(/\b33$/m, @cat) == scalar @files;
+      print "ok 2\n";
+ }

diff --cc lib/FileCache/t/05override.t
index 0000000,a807c25..6fdf873
mode 000000,100644..100644
--- /dev/null
--- 2/lib/FileCache/t/05override.t
+++ b/lib/FileCache/t/05override.t
@@@ -1,0 -1,21 +1,21 @@@
 -  unlink("Foo_Bar");
+ #!./perl
+ BEGIN {
+     use FileCache;
+     chdir 't' if -d 't';
+ 
+     #For tests within the perl distribution
+     @INC = '../lib' if -d '../lib';
+     END;
+ }
+ END{
 -     cacheout local $_ = "Foo_Bar";
++  unlink("Foo'Bar");
+ }
+ print "1..1\n";
+ 
+ {# Test 5: that close is overridden properly within the caller
++     cacheout local $_ = "Foo'Bar";
+      print $_ "Hello World\n";
+      close($_);
+      print 'not ' if fileno($_);
+      print "ok 1\n";
+ }

diff --cc makedef.pl
Simple merge

diff --cc perlio.c
Simple merge

diff --cc pp_sys.c
Simple merge