From: Michael G. Schwern <schwern@pobox.com>
Date: Sun, 23 Sep 2001 03:34:39 +0000 (-0400)
Subject: Fixing lib/File/Find/t/taint.t on VMS
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=39e79f6b7da6190c441d02fdb038af6bdc815b1e;p=p5sagit%2Fp5-mst-13.2.git

Fixing lib/File/Find/t/taint.t on VMS
Message-Id: <20010923033439.E7005@blackrider>

p4raw-id: //depot/perl@12152
---

diff --git a/lib/File/Find.pm b/lib/File/Find.pm
index de0b534..ae76323 100644
--- a/lib/File/Find.pm
+++ b/lib/File/Find.pm
@@ -641,16 +641,14 @@ sub _find_dir($$$) {
     my $SE= [];
     my $dir_name= $p_dir;
     my $dir_pref;
-    my $dir_rel;
+    my $dir_rel = $File::Find::current_dir;
     my $tainted = 0;
 
     if ($Is_MacOS) {
 	$dir_pref= ($p_dir =~ /:$/) ? $p_dir : "$p_dir:"; # preface
-	$dir_rel= ':'; # directory name relative to current directory
     }
     else {
 	$dir_pref= ( $p_dir eq '/' ? '/' : "$p_dir/" );
-	$dir_rel= '.'; # directory name relative to current directory
     }
 
     local ($dir, $name, $prune, *DIR);
@@ -809,12 +807,7 @@ sub _find_dir($$$) {
 
 	    if ( $nlink == -2 ) {
 		$name = $dir = $p_dir; # $File::Find::name / dir
-		if ($Is_MacOS) {
-		    $_ = ':'; # $_
-		}
-		else {
-		    $_ = '.';
-		}
+                $_ = $File::Find::current_dir;
 		&$post_process;		# End-of-directory processing
 	    }
 	    elsif ( $nlink < 0 ) {  # must be finddepth, report dirname now
@@ -865,7 +858,7 @@ sub _find_dir_symlnk($$$) {
     my $dir_name = $p_dir;
     my $dir_pref;
     my $loc_pref;
-    my $dir_rel;
+    my $dir_rel = $File::Find::current_dir;
     my $byd_flag; # flag for pending stack entry if $bydepth
     my $tainted = 0;
     my $ok = 1;
@@ -873,11 +866,9 @@ sub _find_dir_symlnk($$$) {
     if ($Is_MacOS) {
 	$dir_pref = ($p_dir =~ /:$/) ? "$p_dir" : "$p_dir:";
 	$loc_pref = ($dir_loc =~ /:$/) ? "$dir_loc" : "$dir_loc:";
-	$dir_rel  = ':'; # directory name relative to current directory
     } else {
 	$dir_pref = ( $p_dir   eq '/' ? '/' : "$p_dir/" );
 	$loc_pref = ( $dir_loc eq '/' ? '/' : "$dir_loc/" );
-	$dir_rel  = '.'; # directory name relative to current directory
     }
 
     local ($dir, $name, $fullname, $prune, *DIR);