Update OS/2 support, and first-pass general cleanup

1 files changed, 52 insertions, 12 deletions

diff --git a/installman b/installman
index 76ab23c558..38bd0af10e 100644
--- a/installman
+++ b/installman
@@ -4,9 +4,11 @@ use Config;
 use Getopt::Long;
 use File::Find;
 use File::Path qw(mkpath);
+use subs qw(unlink chmod rename link);
 require Cwd;
 
 umask 022;
+$ENV{SHELL} = 'sh' if $^O eq 'os2';
 
 $ver = $];
 $release = substr($ver,0,3);   # Not used presently.
@@ -40,11 +42,12 @@ $notify = $opt_notify || $opt_n;
 
 #Sanity checks
 
--x  "./perl"	|| warn "./perl not found!  Have you run make?\n";
+-x  "./perl$Config{exe_ext}" 
+  or warn "./perl$Config{exe_ext} not found!  Have you run make?\n";
 -d  $Config{'installprivlib'}
 	|| warn "Perl library directory $Config{'installprivlib'} not found.
 		Have you run make install?.  (Installing anyway.)\n";
--x 't/TEST'		|| warn "WARNING: You've never run 'make test'!!!",
+-x "t/perl$Config{exe_ext}"		|| warn "WARNING: You've never run 'make test'!!!",
 	"  (Installing anyway.)\n";
 
 # Install the main pod pages.
@@ -68,7 +71,7 @@ sub runpod2man {
     # are enhancements or changes from previous installed versions.
     # The error message doesn't include the '..' because the user
     # won't be aware that we've chdir to $poddir.
-    -x  "../pod/pod2man" || die "Executable pod/pod2man not found.\n";
+    -r  "../pod/pod2man" || die "Executable pod/pod2man not found.\n";
 
     # We want to be sure to use the current perl.  We can't rely on
     # the installed perl because it might not be actually installed
@@ -85,19 +88,26 @@ sub runpod2man {
     find(\&lsmodpods, '.');
     foreach $mod (@modpods) {
 	$manpage = $mod;
+	my $tmp;
+	# Skip .pm files that have corresponding .pod files, and Functions.pm.
+	next if (($tmp = $mod) =~ s/\.pm$/.pod/ && -f $tmp);
+	next if ($mod eq 'Pod/Functions.pm');	#### Used only by pod itself
+
 	# Convert name from  File/Basename.pm to File::Basename.3 format,
 	# if necessary.
 	$manpage =~ s#\.p(m|od)$##;
-	$manpage =~ s#/#::#g;
+	if ($^O eq 'os2') {
+	  $manpage =~ s#/#.#g;
+	} else {
+	  $manpage =~ s#/#::#g;
+	}
+	$tmp = "${mandir}/${manpage}.tmp";
 	$manpage = "${mandir}/${manpage}.${manext}";
-	&cmd("$pod2man $mod > $manpage.tmp");
-	if (-s "$manpage.tmp") {
-	    rename("$manpage.tmp", $manpage) && next;
-	    warn "cannot rename to $manpage: $!";
+	if (&cmd("$pod2man $mod > $tmp") == 0 && !$notify && -s $tmp) {
+	    rename($tmp, $manpage) && next;
 	}
-	print STDERR "unlink $manpage.tmp\n";
 	unless ($notify) {
-	    unlink("$manpage.tmp") || warn "cannot unlink $manpage.tmp: $!";
+    unlink($tmp);
 	}
     }
     chdir "$builddir" || die "Unable to cd back to $builddir directory!\n$!\n";
@@ -135,18 +145,48 @@ sub cmd {
     return $? != 0;
 }
 
+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";
+( CORE::unlink($name) and ++$cnt 
+    or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
+    }
+    return $cnt;
+}
+
 sub link {
     local($from,$to) = @_;
 
     print STDERR "  ln $from $to\n";
-    link($from,$to) || warn "Couldn't link $from to $to: $!\n" unless $notify;
+    eval { CORE::link($from,$to) }
+|| system('cp', $from, $to) == 0
+|| warn "Couldn't link $from to $to: $!\n" unless $notify;
+}
+
+sub rename {
+    local($from,$to) = @_;
+    if (-f $to and not unlink($to)) {
+my($i);
+for ($i = 1; $i < 50; $i++) {
+    last if CORE::rename($to, "$to.$i");
+}
+warn("Cannot rename to `$to.$i': $!"), return 0 
+    if $i >= 50;	# Give up!
+    }
+    link($from,$to) || return 0;
+    unlink($from);
 }
 
 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 $notify;
 }