(Retracted by #11908)

Subject: [PATCH] Re: [PATCH lib/File/Find.pm lib/File/Find/taint.t] Fixing those damned taint tests
Message-ID: <20010905155821.I632@blackrider>

p4raw-id: //depot/perl@11898

diff --git a/lib/File/Find.pm b/lib/File/Find.pm
index eb4b2de..bfcbcfd 100644 (file)
--- a/lib/File/Find.pm
+++ b/lib/File/Find.pm
@@ -475,7 +475,7 @@ sub _find_opt {
        $pre_process, $post_process, $dangling_symlinks);
     local($dir, $name, $fullname, $prune);
 
-    my $cwd            = $wanted->{bydepth} ? Cwd::fastcwd() : Cwd::cwd();
+    my $cwd            = $wanted->{bydepth} ? Cwd::fastcwd() : Cwd::getcwd();
     my $cwd_untainted  = $cwd;
     my $check_t_cwd    = 1;
     $wanted_callback   = $wanted->{wanted};

diff --git a/lib/File/Find/taint.t b/lib/File/Find/taint.t
index e4a292b..3d7e236 100644 (file)
--- a/lib/File/Find/taint.t
+++ b/lib/File/Find/taint.t
@@ -44,8 +44,6 @@ use File::Spec;
 use Cwd;
 
 
-my $NonTaintedCwd = $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'os2';
-
 cleanup();
 
 find({wanted => sub { print "ok 1\n" if $_ eq 'commonsense.t'; },
@@ -333,12 +331,8 @@ eval {File::Find::find( {wanted => \&simple_wanted, untaint => 1,
 
 print "# $@" if $@;
 #$^D = 8;
-if ($NonTaintedCwd) {
-       Skip("$^O does not taint cwd");
-    } 
-else {
-       Check( $@ =~ m|insecure cwd| );
-}
+Check( $@ =~ m|insecure cwd| );
+
 chdir($cwd_untainted);
 
 
@@ -406,12 +400,8 @@ if ( $symlink_exists ) {
     eval {File::Find::find( {wanted => \&simple_wanted, untaint => 1,
                              untaint_skip => 1, untaint_pattern =>
                              qr|^(NO_MATCH)$|}, topdir('fa') );};
-    if ($NonTaintedCwd) {
-       Skip("$^O does not taint cwd");
-    } 
-    else {
-       Check( $@ =~ m|insecure cwd| );
-    }
+    Check( $@ =~ m|insecure cwd| );
+
     chdir($cwd_untainted);
 }