Change 19839: FileCache 1.03 broken on VMS -- possible patch

[Jarkko Hietaniemi]

Change 19839 by [EMAIL PROTECTED] on 2003/06/22 16:31:05

        Subject: FileCache 1.03 broken on VMS -- possible patch
        From: "Craig A. Berry" <[EMAIL PROTECTED]>
        Date: Sat, 21 Jun 2003 10:31:59 -0500
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

... //depot/perl/lib/FileCache.pm#13 edit
... //depot/perl/lib/FileCache/t/01open.t#2 edit
... //depot/perl/lib/FileCache/t/03append.t#2 edit
... //depot/perl/lib/FileCache/t/05override.t#2 edit

Differences ...

==== //depot/perl/lib/FileCache.pm#13 (text) ====
Index: perl/lib/FileCache.pm
--- perl/lib/FileCache.pm#12~19770~     Fri Jun 13 21:36:18 2003
+++ perl/lib/FileCache.pm       Sun Jun 22 09:31:05 2003
@@ -72,6 +72,7 @@
 
 require 5.006;
 use Carp;
+use Config;
 use strict;
 no strict 'refs';
 # These are not C<my> for legacy reasons.
@@ -88,7 +89,9 @@
     *{$pkg.'::close'}    = \&cacheout_close;
 
     # Reap our children
-    @{"$pkg\::SIG"}{'CLD', 'CHLD', 'PIPE'} = ('IGNORE')x3;
+    ${"$pkg\::SIG"}{'CLD'}  = 'IGNORE' if $Config{sig_name} =~ /\bCLD\b/;
+    ${"$pkg\::SIG"}{'CHLD'} = 'IGNORE' if $Config{sig_name} =~ /\bCHLD\b/;
+    ${"$pkg\::SIG"}{'PIPE'} = 'IGNORE' if $Config{sig_name} =~ /\bPIPE\b/;
 
     # Truth is okay here because setting maxopen to 0 would be bad
     return $cacheout_maxopen = $args{maxopen} if $args{maxopen};

==== //depot/perl/lib/FileCache/t/01open.t#2 (text) ====
Index: perl/lib/FileCache/t/01open.t
--- perl/lib/FileCache/t/01open.t#1~19783~      Sat Jun 14 09:30:23 2003
+++ perl/lib/FileCache/t/01open.t       Sun Jun 22 09:31:05 2003
@@ -2,7 +2,7 @@
 use FileCache;
 use vars qw(@files);
 BEGIN {
-    @files = qw(foo bar baz quux Foo'Bar);
+    @files = qw(foo bar baz quux Foo_Bar);
     chdir 't' if -d 't';
 
     #For tests within the perl distribution

==== //depot/perl/lib/FileCache/t/03append.t#2 (text) ====
Index: perl/lib/FileCache/t/03append.t
--- perl/lib/FileCache/t/03append.t#1~19783~    Sat Jun 14 09:30:23 2003
+++ perl/lib/FileCache/t/03append.t     Sun Jun 22 09:31:05 2003
@@ -2,7 +2,7 @@
 use FileCache maxopen=>2;
 use vars qw(@files);
 BEGIN {
-    @files = qw(foo bar baz quux Foo'Bar);
+    @files = qw(foo bar baz quux Foo_Bar);
     chdir 't' if -d 't';
 
     #For tests within the perl distribution

==== //depot/perl/lib/FileCache/t/05override.t#2 (text) ====
Index: perl/lib/FileCache/t/05override.t
--- perl/lib/FileCache/t/05override.t#1~19783~  Sat Jun 14 09:30:23 2003
+++ perl/lib/FileCache/t/05override.t   Sun Jun 22 09:31:05 2003
@@ -8,12 +8,12 @@
     END;
 }
 END{
-  unlink("Foo'Bar");
+  unlink("Foo_Bar");
 }
 print "1..1\n";
 
 {# Test 5: that close is overridden properly within the caller
-     cacheout local $_ = "Foo'Bar";
+     cacheout local $_ = "Foo_Bar";
      print $_ "Hello World\n";
      close($_);
      print 'not ' if fileno($_);
End of Patch.