Integrate with Sarathy.

[p5sagit/p5-mst-13.2.git] / lib / File / Path.pm

diff --git a/lib/File/Path.pm b/lib/File/Path.pm
index bac48a1..46f360a 100644 (file)
--- a/lib/File/Path.pm
+++ b/lib/File/Path.pm
@@ -73,7 +73,7 @@ than VMS is settled.  (defaults to FALSE)
 =back
 
 It returns the number of files successfully deleted.  Symlinks are
-treated as ordinary files.
+simply deleted and not followed.
 
 B<NOTE:> If the third parameter is not TRUE, C<rmtree> is B<unsecure>
 in the face of failure or interruption.  Files and directories which
@@ -94,14 +94,12 @@ Charles Bailey <F<bailey@newman.upenn.edu>>
 use 5.005_64;
 use Carp;
 use File::Basename ();
-use DirHandle ();
 use Exporter ();
 use strict;
 
-our($VERSION, @ISA, @EXPORT);
-$VERSION = "1.0402";
-@ISA = qw( Exporter );
-@EXPORT = qw( mkpath rmtree );
+our $VERSION = "1.0403";
+our @ISA = qw( Exporter );
+our @EXPORT = qw( mkpath rmtree );
 
 my $Is_VMS = $^O eq 'VMS';
 
@@ -120,7 +118,7 @@ sub mkpath {
     $paths = [$paths] unless ref $paths;
     my(@created,$path);
     foreach $path (@$paths) {
-       $path .= '/' if $^O eq 'os2' and $path =~ /^\w:$/; # feature of CRT 
+       $path .= '/' if $^O eq 'os2' and $path =~ /^\w:\z/s; # feature of CRT 
        next if -d $path;
        # Logic wants Unix paths, so go with the flow.
        $path = VMS::Filespec::unixify($path) if $Is_VMS;
@@ -159,7 +157,7 @@ sub rmtree {
 
     my($root);
     foreach $root (@{$roots}) {
-       $root =~ s#/$##;
+       $root =~ s#/\z##;
        (undef, undef, my $rp) = lstat $root or next;
        $rp &= 07777;   # don't forget setuid, setgid, sticky bits
        if ( -d _ ) {
@@ -171,16 +169,20 @@ sub rmtree {
              or carp "Can't make directory $root read+writeable: $!"
                unless $safe;
 
-           my $d = DirHandle->new($root)
-             or carp "Can't read $root: $!";
-           @files = $d->read;
-           $d->close;
+           if (opendir my $d, $root) {
+               @files = readdir $d;
+               closedir $d;
+           }
+           else {
+               carp "Can't read $root: $!";
+               @files = ();
+           }
 
            # Deleting large numbers of files from VMS Files-11 filesystems
            # is faster if done in reverse ASCIIbetical order 
            @files = reverse @files if $Is_VMS;
-           ($root = VMS::Filespec::unixify($root)) =~ s#\.dir$## if $Is_VMS;
-           @files = map("$root/$_", grep $_!~/^\.{1,2}$/,@files);
+           ($root = VMS::Filespec::unixify($root)) =~ s#\.dir\z## if $Is_VMS;
+           @files = map("$root/$_", grep $_!~/^\.{1,2}\z/s,@files);
            $count += rmtree(\@files,$verbose,$safe);
            if ($safe &&
                ($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) {
@@ -203,7 +205,9 @@ sub rmtree {
        }
        else { 
            if ($safe &&
-               ($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) {
+               ($Is_VMS ? !&VMS::Filespec::candelete($root)
+                        : !(-l $root || -w $root)))
+           {
                print "skipped $root\n" if $verbose;
                next;
            }