Change 31714: [patch@31701] /lib/File/Find/t/taint.t - VMS Symlinks Part 3 of ? From: "John E. Malmberg"

[Craig A . Berry]

Change 31714 by [EMAIL PROTECTED] on 2007/08/15 02:33:24

        Subject: [EMAIL PROTECTED] /lib/File/Find/t/taint.t - VMS Symlinks Part 
3 of ?
        From: "John E. Malmberg" <[EMAIL PROTECTED]>
        Date: Mon, 13 Aug 2007 20:44:41 -0500
        Message-id: <[EMAIL PROTECTED]>

Affected files ...

... //depot/perl/lib/File/Find/t/taint.t#11 edit

Differences ...

==== //depot/perl/lib/File/Find/t/taint.t#11 (text) ====
Index: perl/lib/File/Find/t/taint.t
--- perl/lib/File/Find/t/taint.t#10~15167~      2002-03-10 20:57:20.000000000 
-0800
+++ perl/lib/File/Find/t/taint.t        2007-08-14 19:33:24.000000000 -0700
@@ -104,6 +104,7 @@
     print "# \$File::Find::dir => '$File::Find::dir'\n";
     print "# \$_ => '$_'\n";
     s#\.$## if ($^O eq 'VMS' && $_ ne '.');
+    s/(.dir)?$//i if ($^O eq 'VMS' && -d _);
        ok( $Expect_File{$_}, "Expected and found $File::Find::name" );
     if ( $FastFileTests_OK ) {
         delete $Expect_File{ $_}
@@ -159,7 +160,9 @@
 
     } else { # $first_arg ne '.'
         return $first_arg unless @_; # return plain filename
-        return File::Spec->catdir($first_arg, @_); # relative path
+       my $fname = File::Spec->catdir($first_arg, @_); # relative path
+       $fname = VMS::Filespec::unixpath($fname) if $^O eq 'VMS';
+        return $fname;
     }
 }
 
@@ -207,7 +210,9 @@
 
     } else { # $first_arg ne '.'
         return $first_arg unless @_; # return plain filename
-        return File::Spec->catfile($first_arg, @_); # relative path
+       my $fname = File::Spec->catfile($first_arg, @_); # relative path
+       $fname = VMS::Filespec::unixify($fname) if $^O eq 'VMS';
+        return $fname;
     }
 }
 
End of Patch.