Re: PATCH for 20001003.004

Message-Id: <E13gTay-0006od-00@iglou.com>

p4raw-id: //depot/perl@7135

2 files changed, 8 insertions, 8 deletions

diff --git a/installman b/installman
index 72c76fd8a2..1fd964d114 100755
--- a/installman
+++ b/installman
@@ -244,7 +244,7 @@ sub link {
 
 sub rename {
     my($from,$to) = @_;
-    if (-f $to and not unlink($to)) {
+    if (-f $to and not &unlink($to)) {
 	my($i);
 	for ($i = 1; $i < 50; $i++) {
 	    last if CORE::rename($to, "$to.$i");
@@ -252,8 +252,8 @@ sub rename {
 	warn("Cannot rename to `$to.$i': $!"), return 0 
 	    if $i >= 50;	# Give up!
     }
-    link($from,$to) || return 0;
-    unlink($from);
+    &link($from,$to) || return 0;
+    &unlink($from)
 }
 
 sub chmod {
diff --git a/installperl b/installperl
index c65af5afa9..07c9bba250 100755
--- a/installperl
+++ b/installperl
@@ -511,7 +511,7 @@ sub safe_unlink {
 
 sub safe_rename {
     my($from,$to) = @_;
-    if (-f $to and not unlink($to)) {
+    if (-f $to and not &unlink($to)) {
 	my($i);
 	for ($i = 1; $i < 50; $i++) {
 	    last if rename($to, "$to.$i");
@@ -520,7 +520,7 @@ sub safe_rename {
 	   if $i >= 50;	# Give up!
     }
     link($from,$to) || return 0;
-    unlink($from);
+    &unlink($from);
 }
 
 sub link {
@@ -625,16 +625,16 @@ sub installlib {
 	    #but we have to delete old *.al and *.ix files from the 5.000
 	    #distribution:
 	    #This might not work because $archname might have changed.
-	    unlink("$installarchlib/$name");
+	    &unlink("$installarchlib/$name");
 	}
         $packlist->{"$installlib/$name"} = { type => 'file' };
 	if (compare($_, "$installlib/$name") || $nonono) {
-	    unlink("$installlib/$name");
+	    &unlink("$installlib/$name");
 	    mkpath("$installlib/$dir", $verbose, 0777);
 	    # HP-UX (at least) needs to maintain execute permissions
 	    # on dynamically-loaded libraries.
 	    copy_if_diff($_, "$installlib/$name")
-		and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444,
+		and &chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444,
 			   "$installlib/$name");
 	}
     }