PERFORCE change 12548 for review

[Gurusamy Sarathy]

Change 12548 by gsar@moonru on 2001/10/21 17:48:01

        change#12220 appears to have pulled in a mainline change that
        isn't applicable to maint-5.6 (some platforms don't taint
        cwd)

Affected files ...

... //depot/maint-5.6/perl/t/lib/filefind-taint.t#3 edit

Differences ...

==== //depot/maint-5.6/perl/t/lib/filefind-taint.t#3 (text) ====
Index: perl/t/lib/filefind-taint.t
--- perl/t/lib/filefind-taint.t.~1~     Sun Oct 21 12:00:05 2001
+++ perl/t/lib/filefind-taint.t Sun Oct 21 12:00:05 2001
@@ -41,6 +41,9 @@
 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 'if.t'; },
@@ -326,8 +329,12 @@
 
 print "# $@" if $@;
 #$^D = 8;
-Check( $@ =~ m|insecure cwd| );
-
+if ($NonTaintedCwd) {
+       Skip("$^O does not taint cwd");
+    } 
+else {
+       Check( $@ =~ m|insecure cwd| );
+}
 chdir($cwd_untainted);
 
 
@@ -395,8 +402,12 @@
     eval {File::Find::find( {wanted => \&simple_wanted, untaint => 1,
                              untaint_skip => 1, untaint_pattern =>
                              qr|^(NO_MATCH)$|}, topdir('fa') );};
-    Check( $@ =~ m|insecure cwd| );
-
+    if ($NonTaintedCwd) {
+       Skip("$^O does not taint cwd");
+    } 
+    else {
+       Check( $@ =~ m|insecure cwd| );
+    }
     chdir($cwd_untainted);
 } 
 
End of Patch.