diff options
author | Paul Fenwick <pjf@perltraining.com.au> | 2009-04-24 23:14:01 +0930 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2009-05-05 09:17:48 +0200 |
commit | 079cb8cc5abf40c0b016f9f878493b4d192d85d3 (patch) | |
tree | 99de0221add239bfe29fbbb2e8fcadbe92def069 /lib | |
parent | 46d6503777f357c38f9d1cde19b6d3d1c6f36d3d (diff) | |
download | perl-079cb8cc5abf40c0b016f9f878493b4d192d85d3.tar.gz |
Make File::Copy always return 0 (not "") on failure.
On Unix systems, the subroutines in File::Copy always return 0
on failure.
On Windows, move() and mv() return 0, but copy() and cp() return "".
This commit makes File::Copy consistently return 0 on failure.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/File/Copy.pm | 2 | ||||
-rwxr-xr-x | lib/File/Copy.t | 39 |
2 files changed, 39 insertions, 2 deletions
diff --git a/lib/File/Copy.pm b/lib/File/Copy.pm index 7393bf48ab..be1442f745 100644 --- a/lib/File/Copy.pm +++ b/lib/File/Copy.pm @@ -213,7 +213,7 @@ sub copy { } } - return syscopy($from, $copy_to); + return syscopy($from, $copy_to) || 0; } my $closefrom = 0; diff --git a/lib/File/Copy.t b/lib/File/Copy.t index 45bc6124a1..cf5b2d9e74 100755 --- a/lib/File/Copy.t +++ b/lib/File/Copy.t @@ -14,7 +14,7 @@ use Test::More; my $TB = Test::More->builder; -plan tests => 451; +plan tests => 459; # We're going to override rename() later on but Perl has to see an override # at compile time to honor it. @@ -396,6 +396,43 @@ SKIP: { } } +# On Unix systems, File::Copy always returns 0 to signal failure, +# even when in list context! On Windows, it always returns "" to signal +# failure. +# +# While returning a list containing a false value is arguably a bad +# API design, at the very least we can make sure it always returns +# the same false value. + +my $NO_SUCH_FILE = "this_file_had_better_not_exist"; +my $NO_SUCH_OTHER_FILE = "my_goodness_im_sick_of_airports"; + +use constant EXPECTED_SCALAR => 0; +use constant EXPECTED_LIST => [ EXPECTED_SCALAR ]; + +my %subs = ( + copy => \&File::Copy::copy, + cp => \&File::Copy::cp, + move => \&File::Copy::move, + mv => \&File::Copy::mv, +); + +SKIP: { + skip( "Test can't run with $NO_SUCH_FILE existing", 2 * keys %subs) + if (-e $NO_SUCH_FILE); + + foreach my $name (keys %subs) { + + my $sub = $subs{$name}; + + my $scalar = $sub->( $NO_SUCH_FILE, $NO_SUCH_OTHER_FILE ); + is( $scalar, EXPECTED_SCALAR, "$name in scalar context"); + + my @array = $sub->( $NO_SUCH_FILE, $NO_SUCH_OTHER_FILE ); + is_deeply( \@array, EXPECTED_LIST, "$name in list context"); + } +} + END { 1 while unlink "file-$$"; 1 while unlink "lib/file-$$"; |