OS/2 and $^O updates, and first-pass general cleanup

1 files changed, 50 insertions, 33 deletions

diff --git a/installperl b/installperl
index da714586fa..3b4f5c255b 100755
--- a/installperl
+++ b/installperl
@@ -3,8 +3,10 @@ BEGIN { @INC=('./lib', '../lib') }
 use File::Find;
 use File::Path qw(mkpath);
 use Config;
+use subs qw(unlink rename link chmod);
 
 $mainperldir = "/usr/bin";
+$exe_ext = $Config{exe_ext};
 
 while (@ARGV) {
     $nonono = 1 if $ARGV[0] eq '-n';
@@ -51,7 +53,6 @@ $dlext = $Config{dlext};
 
 $d_dosuid = $Config{d_dosuid};
 $binexp = $Config{binexp};
-$osname = $Config{osname};
 
 # Do some quick sanity checks.
 
@@ -63,8 +64,8 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 -w $installbin		|| die "$installbin is not writable by you\n"
 	unless $installbin =~ m#^/afs/# || $nonono;
 
--x 'perl'		|| die "perl isn't executable!\n";
--x 'suidperl'		|| die "suidperl isn't executable!\n" if $d_dosuid;
+-x 'perl' . $exe_ext	|| die "perl isn't executable!\n";
+-x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
 
 -x 't/TEST'		|| warn "WARNING: You've never run 'make test'!!!",
 	"  (Installing anyway.)\n";
@@ -82,13 +83,13 @@ if ($d_shrplib) {
 
 # First we install the version-numbered executables.
 
-&safe_unlink("$installbin/perl$ver");
-&cmd("cp perl $installbin/perl$ver");
+&safe_unlink("$installbin/perl$ver$exe_ext");
+&cmd("cp perl$exe_ext $installbin/perl$ver$exe_ext");
 
-&safe_unlink("$installbin/sperl$ver");
+&safe_unlink("$installbin/sperl$ver$exe_ext");
 if ($d_dosuid) {
-    &cmd("cp suidperl $installbin/sperl$ver");
-    &chmod(04711, "$installbin/sperl$ver");
+    &cmd("cp suidperl$exe_ext $installbin/sperl$ver$exe_ext");
+    &chmod(04711, "$installbin/sperl$ver$exe_ext");
 }
 
 exit 0 if $versiononly;
@@ -96,15 +97,16 @@ exit 0 if $versiononly;
 # Make links to ordinary names if installbin directory isn't current directory.
 
 if (! &samepath($installbin, '.')) {
-    &safe_unlink("$installbin/perl", "$installbin/suidperl");
-    &link("$installbin/perl$ver", "$installbin/perl");
-    &link("$installbin/sperl$ver", "$installbin/suidperl") if $d_dosuid;
+    &safe_unlink("$installbin/perl$exe_ext", "$installbin/suidperl$exe_ext");
+    &link("$installbin/perl$ver$exe_ext", "$installbin/perl$exe_ext");
+    &link("$installbin/sperl$ver$exe_ext", "$installbin/suidperl$exe_ext") 
+      if $d_dosuid;
 }
 
 if (! &samepath($installbin, 'x2p')) {
-    &safe_unlink("$installbin/a2p");
-    &cmd("cp x2p/a2p $installbin/a2p");
-    &chmod(0755, "$installbin/a2p");
+    &safe_unlink("$installbin/a2p$exe_ext");
+    &cmd("cp x2p/a2p$exe_ext $installbin/a2p$exe_ext");
+    &chmod(0755, "$installbin/a2p$exe_ext");
 }
 
 # Install scripts.
@@ -177,7 +179,7 @@ foreach $file (<*.h libperl*.*>) {
     cp_if_diff($file,"$installarchlib/CORE/$file");
 }
 # AIX needs perl.exp installed as well.
-cp_if_diff("perl.exp" ,"$installarchlib/CORE/perl.exp") if ($osname eq 'aix');
+cp_if_diff("perl.exp" ,"$installarchlib/CORE/perl.exp") if ($^O eq 'aix');
 
 # If they have built sperl.o...
 cp_if_diff("sperl.o" ,"$installarchlib/CORE/sperl.o") if (-f 'sperl.o');
@@ -190,14 +192,14 @@ $mainperl_is_instperl = 0;
 if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) {
     # First make sure $mainperldir/perl is not already the same as
     # the perl we just installed
-    if (-x "$mainperldir/perl") {
+    if (-x "$mainperldir/perl$exe_ext") {
 	# Try to be clever about mainperl being a symbolic link
 	# to binexp/perl if binexp and installbin are different.
 	$mainperl_is_instperl =
-	    &samepath("$mainperldir/perl", "$installbin/perl") ||
+	    &samepath("$mainperldir/perl$exe_ext", "$installbin/perl$exe_ext") ||
 	     (($binexp ne $installbin) &&
-	      (-l "$mainperldir/perl") &&
-	      ((readlink "$mainperldir/perl") eq "$binexp/perl"));
+	      (-l "$mainperldir/perl$exe_ext") &&
+	      ((readlink "$mainperldir/perl$exe_ext") eq "$binexp/perl$exe_ext"));
     }
     if ((! $mainperl_is_instperl) &&
 	(&yn("Many scripts expect perl to be installed as " .
@@ -205,10 +207,10 @@ if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) {
 	     "Do you wish to have $mainperldir/perl be the same as\n" .
 	     "$binexp/perl? [y] ")))
     {	
-	unlink("$mainperldir/perl");
-	eval 'link("$installbin/perl", "$mainperldir/perl")' ||
-	eval 'symlink("$binexp/perl", "$mainperldir/perl")' ||
-	&cmd("cp $installbin/perl $mainperldir");
+	unlink("$mainperldir/perl$exe_ext");
+	eval 'link("$installbin/perl$exe_ext", "$mainperldir/perl$exe_ext")' ||
+	eval 'symlink("$binexp/perl$exe_ext", "$mainperldir/perl$exe_ext")' ||
+	&cmd("cp $installbin/perl$exe_ext $mainperldir$exe_ext");
 	$mainperl_is_instperl = 1;
     }
 }
@@ -219,7 +221,9 @@ if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) {
 # Also skip $mainperl if the user opted to have it be a link to the
 # installed perl.
 
-@path = split(/:/, $ENV{"PATH"});
+$dirsep = ($^O eq 'os2') ? ';' : ':' ;
+($path = $ENV{"PATH"}) =~ s:\\:/:g ;
+@path = split(/$dirsep/, $path);
 @otherperls = ();
 for (@path) {
     next unless m,^/,;
@@ -227,7 +231,8 @@ for (@path) {
     # Use &samepath here because some systems have other dirs linked
     # to $mainperldir (like SunOS)
     next if ($mainperl_is_instperl && &samepath($_, $mainperldir));
-    push(@otherperls, "$_/perl") if (-x "$_/perl" && ! -d "$_/perl");
+    push(@otherperls, "$_/perl$exe_ext")
+      if (-x "$_/perl$exe_ext" && ! -d "$_/perl$exe_ext");
 }
 if (@otherperls) {
     print STDERR "\nWarning: perl appears in your path in the following " .
@@ -256,12 +261,16 @@ sub yn {
 
 sub unlink {
     local(@names) = @_;
+    my($cnt) = 0;
 
     foreach $name (@names) {
 	next unless -e $name;
+	chmod 0777, $name if $^O eq 'os2';
 	print STDERR "  unlink $name\n";
-	unlink($name) || warn "Couldn't unlink $name: $!\n" unless $nonono;
+	( CORE::unlink($name) and ++$cnt 
+	  or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
     }
+    return $cnt;
 }
 
 sub safe_unlink {
@@ -269,9 +278,10 @@ sub safe_unlink {
 
     foreach $name (@names) {
 	next unless -e $name;
-	print STDERR "  unlink $name\n";
 	next if $nonono;
-	next if unlink($name);
+	chmod 0777, $name if $^O eq 'os2';
+	print STDERR "  unlink $name\n";
+	next if CORE::unlink($name);
 	warn "Couldn't unlink $name: $!\n";
 	if ($! =~ /busy/i) {
 	    print STDERR "  mv $name $name.old\n";
@@ -291,12 +301,13 @@ sub cmd {
 
 sub rename {
     local($from,$to) = @_;
-    unless (unlink($to)) {
+    if (-f $to and not unlink($to)) {
 	my($i);
 	for ($i = 1; $i < 50; $i++) {
-	    last if rename($to, "$to.$i");
+	    last if CORE::rename($to, "$to.$i");
 	}
-	return 0 if $i >= 50;	# Give up!
+	warn("Cannot rename to `$to.$i': $!"), return 0 
+	   if $i >= 50;	# Give up!
     }
     link($from,$to) || return 0;
     unlink($from);
@@ -306,14 +317,20 @@ sub link {
     local($from,$to) = @_;
 
     print STDERR "  ln $from $to\n";
-    link($from,$to) || warn "Couldn't link $from to $to: $!\n" unless $nonono;
+    eval {
+      CORE::link($from,$to) || warn "Couldn't link $from to $to: $!\n" unless $nonono;
+    };
+    if ($@) {
+      system( $cp, $from, $to )
+	&& warn "Couldn't copy $from to $to: $!\n" unless $nonono;
+    }
 }
 
 sub chmod {
     local($mode,$name) = @_;
 
     printf STDERR "  chmod %o %s\n", $mode, $name;
-    chmod($mode,$name) || warn sprintf("Couldn't chmod %o %s: $!\n",$mode,$name)
+    CORE::chmod($mode,$name) || warn sprintf("Couldn't chmod %o %s: $!\n",$mode,$name)
 	unless $nonono;
 }