X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FFile%2FCopy.pm;h=828473e2d3f097c97c6f22105b8ed3d06111f74e;hb=4b711db359c9778a062571f88eafc4dab0b9c81d;hp=d5f44f8d737a21f4f605be70e62ff4c4eded2886;hpb=2986a63f7e513cf37f46db9f211b77071260031f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/File/Copy.pm b/lib/File/Copy.pm index d5f44f8..828473e 100644 --- a/lib/File/Copy.pm +++ b/lib/File/Copy.pm @@ -7,11 +7,11 @@ package File::Copy; -use 5.6.0; +use 5.006; use strict; use warnings; -use Carp; use File::Spec; +use Config; our(@ISA, @EXPORT, @EXPORT_OK, $VERSION, $Too_Big, $Syscopy_is_copy); sub copy; sub syscopy; @@ -23,7 +23,7 @@ sub mv; # package has not yet been updated to work with Perl 5.004, and so it # would be a Bad Thing for the CPAN module to grab it and replace this # module. Therefore, we set this module's version higher than 2.0. -$VERSION = '2.04'; +$VERSION = '2.08_01'; require Exporter; @ISA = qw(Exporter); @@ -32,6 +32,18 @@ require Exporter; $Too_Big = 1024 * 1024 * 2; +sub croak { + require Carp; + goto &Carp::croak; +} + +my $macfiles; +if ($^O eq 'MacOS') { + $macfiles = eval { require Mac::MoreFiles }; + warn 'Mac::MoreFiles could not be loaded; using non-native syscopy' + if $@ && $^W; +} + sub _catname { my($from, $to) = @_; if (not defined &basename) { @@ -65,6 +77,21 @@ sub copy { || UNIVERSAL::isa($to, 'IO::Handle')) : (ref(\$to) eq 'GLOB')); + if ($from eq $to) { # works for references, too + croak("'$from' and '$to' are identical (not copied)"); + } + + if ((($Config{d_symlink} && $Config{d_readlink}) || $Config{d_link}) && + !($^O eq 'MSWin32' || $^O eq 'os2' || $^O eq 'vms')) { + my @fs = stat($from); + if (@fs) { + my @ts = stat($to); + if (@ts && $fs[0] == $ts[0] && $fs[1] == $ts[1]) { + croak("'$from' and '$to' are identical (not copied)"); + } + } + } + if (!$from_a_handle && !$to_a_handle && -d $to && ! -d $from) { $to = _catname($from, $to); } @@ -84,24 +111,27 @@ sub copy { my $closefrom = 0; my $closeto = 0; my ($size, $status, $r, $buf); - local(*FROM, *TO); local($\) = ''; + my $from_h; if ($from_a_handle) { - *FROM = *$from{FILEHANDLE}; + $from_h = $from; } else { $from = _protect($from) if $from =~ /^\s/s; - open(FROM, "< $from\0") or goto fail_open1; - binmode FROM or die "($!,$^E)"; + $from_h = \do { local *FH }; + open($from_h, "< $from\0") or goto fail_open1; + binmode $from_h or die "($!,$^E)"; $closefrom = 1; } + my $to_h; if ($to_a_handle) { - *TO = *$to{FILEHANDLE}; + $to_h = $to; } else { $to = _protect($to) if $to =~ /^\s/s; - open(TO,"> $to\0") or goto fail_open2; - binmode TO or die "($!,$^E)"; + $to_h = \do { local *FH }; + open($to_h,"> $to\0") or goto fail_open2; + binmode $to_h or die "($!,$^E)"; $closeto = 1; } @@ -109,7 +139,7 @@ sub copy { $size = shift(@_) + 0; croak("Bad buffer size for copy: $size\n") unless ($size > 0); } else { - $size = -s FROM; + $size = tied(*$from_h) ? 0 : -s $from_h || 0; $size = 1024 if ($size < 512); $size = $Too_Big if ($size > $Too_Big); } @@ -117,17 +147,17 @@ sub copy { $! = 0; for (;;) { my ($r, $w, $t); - defined($r = sysread(FROM, $buf, $size)) + defined($r = sysread($from_h, $buf, $size)) or goto fail_inner; last unless $r; for ($w = 0; $w < $r; $w += $t) { - $t = syswrite(TO, $buf, $r - $w, $w) + $t = syswrite($to_h, $buf, $r - $w, $w) or goto fail_inner; } } - close(TO) || goto fail_open2 if $closeto; - close(FROM) || goto fail_open1 if $closefrom; + close($to_h) || goto fail_open2 if $closeto; + close($from_h) || goto fail_open1 if $closefrom; # Use this idiom to avoid uninitialized value warning. return 1; @@ -137,14 +167,14 @@ sub copy { if ($closeto) { $status = $!; $! = 0; - close TO; + close $to_h; $! = $status unless $!; } fail_open2: if ($closefrom) { $status = $!; $! = 0; - close FROM; + close $from_h; $! = $status unless $!; } fail_open1: @@ -153,7 +183,7 @@ sub copy { sub move { my($from,$to) = @_; - my($copied,$fromsz,$tosz1,$tomt1,$tosz2,$tomt2,$sts,$ossts); + my($fromsz,$tosz1,$tomt1,$tosz2,$tomt2,$sts,$ossts); if (-d $to && ! -d $from) { $to = _catname($from, $to); @@ -167,7 +197,6 @@ sub move { } return 1 if rename $from, $to; - ($sts,$ossts) = ($! + 0, $^E + 0); # Did rename return an error even though it succeeded, because $to # is on a remote NFS file system, and NFS lost the server's ack? return 1 if defined($fromsz) && !-e $from && # $from disappeared @@ -176,7 +205,8 @@ sub move { $tosz2 == $fromsz; # it's all there ($tosz1,$tomt1) = (stat($to))[7,9]; # just in case rename did something - return 1 if ($copied = copy($from,$to)) && unlink($from); + return 1 if copy($from,$to) && unlink($from); + ($sts,$ossts) = ($! + 0, $^E + 0); ($tosz2,$tomt2) = ((stat($to))[7,9],0,0) if defined $tomt1; unlink($to) if !defined($tomt1) or $tomt1 != $tomt2 or $tosz1 != $tosz2; @@ -210,8 +240,7 @@ unless (defined &syscopy) { return 0 unless @_ == 2; return Win32::CopyFile(@_, 1); }; - } elsif ($^O eq 'MacOS') { - require Mac::MoreFiles; + } elsif ($macfiles) { *syscopy = sub { my($from, $to) = @_; my($dir, $toname); @@ -243,17 +272,16 @@ File::Copy - Copy files or filehandles =head1 SYNOPSIS - use File::Copy; + use File::Copy; - copy("file1","file2"); - copy("Copy.pm",\*STDOUT);' + copy("file1","file2") or die "Copy failed: $!"; + copy("Copy.pm",\*STDOUT); move("/dev1/fileA","/dev2/fileB"); - use POSIX; - use File::Copy cp; + use File::Copy "cp"; $n = FileHandle->new("/a/file","r"); - cp($n,"x");' + cp($n,"x"); =head1 DESCRIPTION @@ -271,7 +299,8 @@ argument may be a string, a FileHandle reference or a FileHandle glob. Obviously, if the first argument is a filehandle of some sort, it will be read from, and if it is a file I it will be opened for reading. Likewise, the second argument will be -written to (and created if need be). +written to (and created if need be). Trying to copy a file on top +of itself is a fatal error. B routine, which copies the file specified in the first parameter to the file specified in the second parameter, preserving OS-specific attributes and file structure. For Unix systems, this is equivalent to the simple -C routine. For VMS systems, this calls the C -routine (see below). For OS/2 systems, this calls the C -XSUB directly. For Win32 systems, this calls C. +C routine, which doesn't preserve OS-specific attributes. For +VMS systems, this calls the C routine (see below). For OS/2 +systems, this calls the C XSUB directly. For Win32 systems, +this calls C. + +On Mac OS (Classic), C calls C, +if available. =head2 Special behaviour if C is defined (OS/2, VMS and Win32)