File::Copy under OS/2

Chip Salzenberg writes:
> 
> Patch now, tarchive later:
> 
>     file: $CPAN/authors/id/CHIPS/perl5.003_17.pat.gz

Almost clean under OS/2: the only problem is with File::Copy: the
test for syscopy was inverted, and test contained some Un*xisms.

Note that the POD contains some line noise, I marked it with ?????.

Enjoy,

p5p-msgid: <199612280347.WAA00293@monk.mps.ohio-state.edu>

1 files changed, 20 insertions, 16 deletions

diff --git a/t/lib/filecopy.t b/t/lib/filecopy.t
index 0a5f4c180c..b718215a1e 100755
--- a/t/lib/filecopy.t
+++ b/t/lib/filecopy.t
@@ -29,56 +29,60 @@ print "not " unless $foo eq "ok 3\n";
 print "ok 2\n";
 
 copy "copy-$$", \*STDOUT;
-unlink "copy-$$";
+unlink "copy-$$" or die "unlink: $!";
 
 open(F,"file-$$");
 copy(*F, "copy-$$");
-open(R, "copy-$$") or die; $foo = <R>; close(R);
+open(R, "copy-$$") or die "open copy-$$: $!"; $foo = <R>; close(R);
 print "not " unless $foo eq "ok 3\n";
 print "ok 4\n";
-unlink "copy-$$";
+unlink "copy-$$" or die "unlink: $!";
 open(F,"file-$$");
 copy(\*F, "copy-$$");
-open(R, "copy-$$") or die; $foo = <R>; close(R);
+close(F) or die "close: $!";
+open(R, "copy-$$") or die; $foo = <R>; close(R) or die "close: $!";
 print "not " unless $foo eq "ok 3\n";
 print "ok 5\n";
-unlink "copy-$$";
+unlink "copy-$$" or die "unlink: $!";
 
 require IO::File;
 $fh = IO::File->new(">copy-$$") or die "Cannot open copy-$$:$!";
+binmode $fh or die;
 copy("file-$$",$fh);
-$fh->close;
+$fh->close or die "close: $!";
 open(R, "copy-$$") or die; $foo = <R>; close(R);
-print "not " unless $foo eq "ok 3\n";
+print "# foo=`$foo'\nnot " unless $foo eq "ok 3\n";
 print "ok 6\n";
-unlink "copy-$$";
+unlink "copy-$$" or die "unlink: $!";
 require FileHandle;
 my $fh = FileHandle->new(">copy-$$") or die "Cannot open copy-$$:$!";
+binmode $fh or die;
 copy("file-$$",$fh);
 $fh->close;
 open(R, "copy-$$") or die; $foo = <R>; close(R);
 print "not " unless $foo eq "ok 3\n";
 print "ok 7\n";
-unlink "file-$$";
+unlink "file-$$" or die "unlink: $!";
 
-print "not " if move("file-$$", "copy-$$") or not -e "copy-$$";
+print "# moved missing file.\nnot " if move("file-$$", "copy-$$");
+print "# target disappeared.\nnot " if not -e "copy-$$";
 print "ok 8\n";
 
-move "copy-$$", "file-$$";
-print "not " unless -e "file-$$" and not -e "copy-$$";
+move "copy-$$", "file-$$" or print "# move did not succeed.\n";
+print "# not moved: $!\nnot " unless -e "file-$$" and not -e "copy-$$";
 open(R, "file-$$") or die; $foo = <R>; close(R);
-print "not " unless $foo eq "ok 3\n";
+print "# foo=`$foo'\nnot " unless $foo eq "ok 3\n";
 print "ok 9\n";
 
 copy "file-$$", "lib";
 open(R, "lib/file-$$") or die; $foo = <R>; close(R);
 print "not " unless $foo eq "ok 3\n";
 print "ok 10\n";
-unlink "lib/file-$$";
+unlink "lib/file-$$" or die "unlink: $!";
 
 move "file-$$", "lib";
-open(R, "lib/file-$$") or die; $foo = <R>; close(R);
+open(R, "lib/file-$$") or die "open lib/file-$$: $!"; $foo = <R>; close(R);
 print "not " unless $foo eq "ok 3\n" and not -e "file-$$";;
 print "ok 11\n";
-unlink "lib/file-$$";
+unlink "lib/file-$$" or die "unlink: $!";