develooper Front page | perl.perl5.changes | Postings from May 2008

Change 33796: The last change to File::Copy broke the perl build.

From:
Rafael Garcia-Suarez
Date:
May 8, 2008 10:00
Subject:
Change 33796: The last change to File::Copy broke the perl build.
Change 33796 by rgs@stcosmo on 2008/05/08 16:56:05

	The last change to File::Copy broke the perl build.

Affected files ...

... //depot/perl/lib/File/Copy.pm#54 edit

Differences ...

==== //depot/perl/lib/File/Copy.pm#54 (text) ====
Index: perl/lib/File/Copy.pm
--- perl/lib/File/Copy.pm#53~33795~	2008-05-08 09:12:36.000000000 -0700
+++ perl/lib/File/Copy.pm	2008-05-08 09:56:05.000000000 -0700
@@ -12,7 +12,8 @@
 use warnings;
 use File::Spec;
 use Config;
-use Fcntl qw [O_CREAT O_WRONLY O_TRUNC];
+# During perl build, we need File::Copy but Fcntl might not be built yet
+my $Fcntl_loaded = eval q{ use Fcntl qw [O_CREAT O_WRONLY O_TRUNC]; 1 };
 our(@ISA, @EXPORT, @EXPORT_OK, $VERSION, $Too_Big, $Syscopy_is_copy);
 sub copy;
 sub syscopy;
@@ -175,10 +176,16 @@
        $to_h = $to;
     } else {
 	$to = _protect($to) if $to =~ /^\s/s;
-       my $perm = (stat $from_h) [2] & 0xFFF;
-       sysopen $to_h, $to, O_CREAT | O_TRUNC | O_WRONLY, $perm
-            or goto fail_open2;
-       binmode $to_h or die "($!,$^E)";
+	if ($Fcntl_loaded) {
+	    my $perm = (stat $from_h) [2] & 0xFFF;
+	    sysopen $to_h, $to, O_CREAT() | O_TRUNC() | O_WRONLY(), $perm
+		or goto fail_open2;
+	}
+	else {
+	    $to_h = \do { local *FH };
+	    open $to_h, ">", $to or goto fail_open2;
+	}
+	binmode $to_h or die "($!,$^E)";
 	$closeto = 1;
     }
 
End of Patch.



Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About