diff options
| author | John E. Malmberg <wb8tyw@qsl.net> | 2007-08-13 15:44:41 -0500 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2007-08-15 02:33:24 +0000 |
| commit | 6d54d661bccf31be63176b062c0eb2f04a051bc9 (patch) | |
| tree | 41f5c96b0acc9520abcc230cfe29aec34589da2c /lib/File | |
| parent | af36fda705dfd5f8d8d5a60ea777cd672a80ccf3 (diff) | |
| download | perl-6d54d661bccf31be63176b062c0eb2f04a051bc9.tar.gz | |
[patch@31701] /lib/File/Find/t/taint.t - VMS Symlinks Part 3 of ?
From: "John E. Malmberg" <wb8tyw@qsl.net>
Message-id: <46C10909.6010805@qsl.net>
p4raw-id: //depot/perl@31714
Diffstat (limited to 'lib/File')
| -rw-r--r-- | lib/File/Find/t/taint.t | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/File/Find/t/taint.t b/lib/File/Find/t/taint.t index 91fe8ee9d8..32c63f5d97 100644 --- a/lib/File/Find/t/taint.t +++ b/lib/File/Find/t/taint.t @@ -104,6 +104,7 @@ sub wanted_File_Dir { 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 @@ sub dir_path { } 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 @@ sub file_path { } 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; } } |