[win32] merge changes#922,944,949,965,970 from maintbranch

p4raw-link: @970 on //depot/maint-5.004/perl: 5362f8886d6c3fb908c863d910b1a158479419e2
p4raw-link: @965 on //depot/maint-5.004/perl: 8472ac73d6d802946d766b5459d2d9c334889a3f
p4raw-link: @949 on //depot/maint-5.004/perl: 4b161ae29769b4a3eb304314bbbfe5969417c8ec
p4raw-link: @944 on //depot/maint-5.004/perl: fa366f5fbba3f21113f9677105663454a3e0b678
p4raw-link: @922 on //depot/maint-5.004/perl: 68daf0ababdc0e913335a90c4361b792b2715301

p4raw-id: //depot/win32/perl@978

1 files changed, 515 insertions, 600 deletions

diff --git a/utils/perlbug.PL b/utils/perlbug.PL
index 724df6b449..68ff2901d5 100644
--- a/utils/perlbug.PL
+++ b/utils/perlbug.PL
@@ -17,7 +17,7 @@ chdir dirname($0);
 $file = basename($0, '.PL');
 $file .= '.com' if $^O eq 'VMS';
 
-open OUT,">$file" or die "Can't create $file: $!";
+open OUT, ">$file" or die "Can't create $file: $!";
 
 # extract patchlevel.h information
 
@@ -27,7 +27,7 @@ my $patchlevel_date = (stat PATCH_LEVEL)[9];
 
 while (<PATCH_LEVEL>) {
     last if $_ =~ /^\s*static\s+char.*?local_patches\[\]\s*=\s*{\s*$/;
-};
+}
 
 my @patches;
 while (<PATCH_LEVEL>) {
@@ -37,11 +37,9 @@ while (<PATCH_LEVEL>) {
     s/"?,?$//;
     s/(['\\])/\\$1/g;
     push @patches, $_ unless $_ eq 'NULL';
-};
-my $patch_desc = "'" . join("',\n\t'", @patches) . "'";
-my @patch_tags = map { my $p=$_; $p=~s/\s.*//; $p } @patches;
-my $patch_tags = join " ", map { "+$_" } @patch_tags;
-$patch_tags .= " " if $patch_tags;
+}
+my $patch_desc = "'" . join("',\n    '", @patches) . "'";
+my $patch_tags = join "", map /(\S+)/ ? "+$1 " : (), @patches;
 
 close PATCH_LEVEL;
 
@@ -65,7 +63,7 @@ my \$config_tag1 = '$] - $Config{cf_time}';
 my \$patchlevel_date = $patchlevel_date;
 my \$patch_tags = '$patch_tags';
 my \@patches = (
-	$patch_desc
+    $patch_desc
 );
 !GROK!THIS!
 
@@ -75,21 +73,18 @@ print OUT <<'!NO!SUBS!';
 
 use Config;
 use Getopt::Std;
-
-BEGIN {
-	eval "use Mail::Send;";
-	$::HaveSend = ($@ eq "");
-	eval "use Mail::Util;";
-	$::HaveUtil = ($@ eq "");
-};
-
-
 use strict;
 
 sub paraprint;
 
+BEGIN {
+    eval "use Mail::Send;";
+    $::HaveSend = ($@ eq "");
+    eval "use Mail::Util;";
+    $::HaveUtil = ($@ eq "");
+};
 
-my($Version) = "1.20";
+my $Version = "1.22";
 
 # Changed in 1.06 to skip Mail::Send and Mail::Util if not available.
 # Changed in 1.07 to see more sendmail execs, and added pipe output.
@@ -114,33 +109,32 @@ my($Version) = "1.20";
 #                 add local patch information
 #                 warn on '-ok' if this is an old system; add '-okay'
 # Changed in 1.20 Added patchlevel.h reading and version/config checks
+# Changed in 1.21 Added '-nok' for reporting build failure DFD 98-05-05
+# Changed in 1.22 Heavy reformatting & minor bugfixes HVDS 98-05-10
 
 # TODO: - Allow the user to re-name the file on mail failure, and
-#       make sure failure (transmission-wise) of Mail::Send is 
+#       make sure failure (transmission-wise) of Mail::Send is
 #       accounted for.
 #       - Test -b option
 
 my( $file, $usefile, $cc, $address, $perlbug, $testaddress, $filename,
-    $subject, $from, $verbose, $ed, 
+    $subject, $from, $verbose, $ed,
     $fh, $me, $Is_MSWin32, $Is_VMS, $msg, $body, $andcc, %REP, $ok);
 
 my $config_tag2 = "$] - $Config{cf_time}";
 
 Init();
 
-if($::opt_h) { Help(); exit; }
-
-if($::opt_d) { Dump(*STDOUT); exit; }
-
-if(!-t STDIN) {
-	paraprint <<EOF;
-Please use perlbug interactively. If you want to 
+if ($::opt_h) { Help(); exit; }
+if ($::opt_d) { Dump(*STDOUT); exit; }
+if (!-t STDIN) {
+    paraprint <<EOF;
+Please use perlbug interactively. If you want to
 include a file, you can use the -f switch.
 EOF
-	die "\n";
+    die "\n";
 }
-
-if(!-t STDOUT) { Dump(*STDOUT); exit; }
+if (!-t STDOUT) { Dump(*STDOUT); exit; }
 
 Query();
 Edit() unless $usefile;
@@ -150,108 +144,114 @@ Send();
 exit;
 
 sub Init {
- 
-	# -------- Setup --------
-
-	$Is_MSWin32 = $^O eq 'MSWin32';
-	$Is_VMS = $^O eq 'VMS';
-
-	getopts("dhva:s:b:f:r:e:SCc:to:");
-	
-
-	# This comment is needed to notify metaconfig that we are
-	# using the $perladmin, $cf_by, and $cf_time definitions.
-
-
-	# -------- Configuration ---------
-	
-	# perlbug address
-	$perlbug = 'perlbug@perl.com';
-
-	
-	# Test address
-	$testaddress = 'perlbug-test@perl.com';
-	
-	# Target address
-	$address = $::opt_a || ($::opt_t ? $testaddress : $perlbug);
-
-	# Users address, used in message and in Reply-To header
-	$from = $::opt_r || "";
-
-	# Include verbose configuration information
-	$verbose = $::opt_v || 0;
-
-	# Subject of bug-report message
-	$subject = $::opt_s || "";
-
-	# Send a file
-	$usefile = ($::opt_f || 0);
-	
-	# File to send as report
-	$file = $::opt_f || "";
-
-	# Body of report
-	$body = $::opt_b || "";
-
-	# Editor
-	$ed = (	$::opt_e || $ENV{VISUAL} || $ENV{EDITOR} || $ENV{EDIT} || 
-		      ($Is_VMS ? "edit/tpu" : $Is_MSWin32 ? "notepad" : "vi")
-	      );
-	      
-        # OK - send "OK" report for build on this system
-        $ok = 0;
-	if ( $::opt_o ) {
-	    if ( $::opt_o eq 'k' or $::opt_o eq 'kay' ) {
-                my $age = time - $patchlevel_date;
-                if ( $::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
-                    my $date = localtime $patchlevel_date;
-                    print <<"EOF";
-\"perlbug -ok\" does not report on Perl versions which are more than
-60 days old.  This Perl version was constructed on $date.
-If you really want to report this, use \"perlbug -okay\".
+    # -------- Setup --------
+
+    $Is_MSWin32 = $^O eq 'MSWin32';
+    $Is_VMS = $^O eq 'VMS';
+
+    getopts("dhva:s:b:f:r:e:SCc:to:n:");
+
+    # This comment is needed to notify metaconfig that we are
+    # using the $perladmin, $cf_by, and $cf_time definitions.
+
+    # -------- Configuration ---------
+
+    # perlbug address
+    $perlbug = 'perlbug@perl.com';
+
+    # Test address
+    $testaddress = 'perlbug-test@perl.com';
+
+    # Target address
+    $address = $::opt_a || ($::opt_t ? $testaddress : $perlbug);
+
+    # Users address, used in message and in Reply-To header
+    $from = $::opt_r || "";
+
+    # Include verbose configuration information
+    $verbose = $::opt_v || 0;
+
+    # Subject of bug-report message
+    $subject = $::opt_s || "";
+
+    # Send a file
+    $usefile = ($::opt_f || 0);
+
+    # File to send as report
+    $file = $::opt_f || "";
+
+    # Body of report
+    $body = $::opt_b || "";
+
+    # Editor
+    $ed = $::opt_e || $ENV{VISUAL} || $ENV{EDITOR} || $ENV{EDIT}
+	|| ($Is_VMS && "edit/tpu")
+	|| ($Is_MSWin32 && "notepad")
+	|| "vi";
+
+    # Not OK - provide build failure template by finessing OK report
+    if ($::opt_n) {
+	if (substr($::opt_n, 0, 2) eq 'ok' )	{
+	    $::opt_o = substr($::opt_n, 1);
+	} else {
+	    Help();
+	    exit();
+	}
+    }
+
+    # OK - send "OK" report for build on this system
+    $ok = 0;
+    if ($::opt_o) {
+	if ($::opt_o eq 'k' or $::opt_o eq 'kay') {
+	    my $age = time - $patchlevel_date;
+	    if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
+		my $date = localtime $patchlevel_date;
+		print <<"EOF";
+"perlbug -ok" and "perlbug -nok" do not report on Perl versions which
+are more than 60 days old.  This Perl version was constructed on
+$date.  If you really want to report this, use
+"perlbug -okay" or "perlbug -nokay".
 EOF
-                    exit();
-                };
-		# force these options
-		$::opt_S = 1; # don't prompt for send
-		$::opt_C = 1; # don't send a copy to the local admin
-		$::opt_s = 1;
-		$subject = "OK: perl $] ${patch_tags}on"
-			  ." $::Config{'archname'} $::Config{'osvers'} $subject";
-		$::opt_b = 1;
-		$body    = "Perl reported to build OK on this system.\n";
-		$ok = 1;
-	    }
-	    else {
-		Help();
 		exit();
 	    }
+	    # force these options
+	    unless ($::opt_n) {
+		$::opt_S = 1; # don't prompt for send
+		$::opt_b = 1; # we have a body
+		$body = "Perl reported to build OK on this system.\n";
+	    }
+	    $::opt_C = 1; # don't send a copy to the local admin
+	    $::opt_s = 1; # we have a subject line
+	    $subject = ($::opt_n ? 'Not ' : '')
+		    . "OK: perl $] ${patch_tags}on"
+		    ." $::Config{'archname'} $::Config{'osvers'} $subject";
+	    $ok = 1;
+	} else {
+	    Help();
+	    exit();
 	}
-      
-	# Possible administrator addresses, in order of confidence
-	# (Note that cf_email is not mentioned to metaconfig, since
-	# we don't really want it. We'll just take it if we have to.)
-        #
-        # This has to be after the $ok stuff above because of the way
-        # that $::opt_C is forced.
-	$cc = ($::opt_C ? "" : (
-		$::opt_c || $::Config{perladmin} || $::Config{cf_email} || $::Config{cf_by}
-		));
-	
-	# My username
-	$me = ( $Is_MSWin32 
-		? $ENV{'USERNAME'} 
-		: ( $^O eq 'os2' 
-		    ? $ENV{'USER'} || $ENV{'LOGNAME'} 
-		    : eval { getpwuid($<) }) );	# May be missing
-
-}
+    }
 
+    # Possible administrator addresses, in order of confidence
+    # (Note that cf_email is not mentioned to metaconfig, since
+    # we don't really want it. We'll just take it if we have to.)
+    #
+    # This has to be after the $ok stuff above because of the way
+    # that $::opt_C is forced.
+    $cc = $::opt_C ? "" : (
+	$::opt_c || $::Config{'perladmin'}
+	|| $::Config{'cf_email'} || $::Config{'cf_by'}
+    );
+
+    # My username
+    $me = $Is_MSWin32 ? $ENV{'USERNAME'}
+	    : $^O eq 'os2' ? $ENV{'USER'} || $ENV{'LOGNAME'}
+	    : eval { getpwuid($<) };	# May be missing
+} # sub Init
 
 sub Query {
-
-	# Explain what perlbug is
-    if ( ! $ok ) {
+    # Explain what perlbug is
+    unless ($ok) {
 	paraprint <<EOF;
 This program provides an easy way to create a message reporting a bug
 in perl, and e-mail it to $address.  It is *NOT* intended for
@@ -263,156 +263,121 @@ and any solutions to such problems, to the people who maintain perl.
 If you're just looking for help with perl, try posting to the Usenet
 newsgroup comp.lang.perl.misc.  If you're looking for help with using
 perl with CGI, try posting to comp.infosystems.www.programming.cgi.
-
 EOF
     }
 
-
-	# Prompt for subject of message, if needed
-	if(! $subject) {
-		paraprint <<EOF;
-First of all, please provide a subject for the 
-message. It should be a concise description of 
+    # Prompt for subject of message, if needed
+    unless ($subject) {
+	paraprint <<EOF;
+First of all, please provide a subject for the
+message. It should be a concise description of
 the bug or problem. "perl bug" or "perl problem"
 is not a concise description.
-
 EOF
-		print "Subject: ";
-	
-		$subject = <>;
-		chop $subject;
-	
-		my($err)=0;
-		while( $subject =~ /^\s*$/ ) {
-			print "\nPlease enter a subject: ";
-			$subject = <>;
-			chop $subject;
-			if($err++>5) {
-				die "Aborting.\n";
-			}
-		}
+	print "Subject: ";
+	$subject = <>;
+
+	my $err = 0;
+	while ($subject !~ /\S/) {
+	    print "\nPlease enter a subject: ";
+	    $subject = <>;
+	    if ($err++ > 5) {
+		die "Aborting.\n";
+	    }
 	}
-	
-
-	# Prompt for return address, if needed
-	if( !$from) {
-
-		# Try and guess return address
-		my($domain);
-		
-		if($::HaveUtil) {
-			$domain = Mail::Util::maildomain();
-		} elsif ($Is_MSWin32) {
-			$domain = $ENV{'USERDOMAIN'};
+	chop $subject;
+    }
+
+    # Prompt for return address, if needed
+    unless ($from) {
+	# Try and guess return address
+	my $guess;
+
+	$guess = $ENV{'REPLY-TO'} || $ENV{'REPLYTO'} || '';
+	unless ($guess) {
+	    my $domain;
+	    if ($::HaveUtil) {
+		$domain = Mail::Util::maildomain();
+	    } elsif ($Is_MSWin32) {
+		$domain = $ENV{'USERDOMAIN'};
+	    } else {
+		require Sys::Hostname;
+		$domain = Sys::Hostname::hostname();
+	    }
+	    if ($domain) {
+		if ($Is_VMS && !$::Config{'d_socket'}) {
+		    $guess = "$domain\:\:$me";
 		} else {
-			require Sys::Hostname;
-			$domain = Sys::Hostname::hostname();
+		    $guess = "$me\@$domain" if $domain;
 		}
-	    
-	    my($guess);
-	                     
-	        if( !$domain) {
-	        	$guess = "";
-	        } elsif ($Is_VMS && !$::Config{'d_socket'}) { 
-	        	$guess = "$domain\:\:$me";
-	        } else {
-		    	$guess = "$me\@$domain" if $domain;
-		    	$guess = "$me\@unknown.addresss" unless $domain;
-			}
-			
-		$guess = $ENV{'REPLYTO'} if defined($ENV{'REPLYTO'});
-		$guess = $ENV{"REPLY-TO"} if defined($ENV{'REPLY-TO'});
-	
-		if( $guess ) {
-		    if ( ! $ok ) {
-			paraprint <<EOF;
-
+	    }
+	}
 
+	if ($guess) {
+	    unless ($ok) {
+		paraprint <<EOF;
 Your e-mail address will be useful if you need to be contacted. If the
 default shown is not your full internet e-mail address, please correct it.
-
 EOF
-                    }
-		} else {
-			paraprint <<EOF;
-
-So that you may be contacted if necessary, please enter 
+	    }
+	} else {
+	    paraprint <<EOF;
+So that you may be contacted if necessary, please enter
 your full internet e-mail address here.
-
 EOF
-		}
-
-		if ( $ok && $guess ne '' ) {
-		    # use it
-		    $from = $guess;
-		}
-		else {
-		    # verify it
-		    print "Your address [$guess]: ";
-		    
-		    $from = <>;
-		    chop $from;
-		    
-		    if($from eq "") { $from = $guess }
-		}
-	
 	}
-	
-	#if( $from =~ /^(.*)\@(.*)$/ ) {
-	#	$mailname = $1;
-	#	$maildomain = $2;
-	#}
-
-	if( $from eq $cc or $me eq $cc ) {
-		# Try not to copy ourselves
-		$cc = "yourself";
-	}
-
 
-	# Prompt for administrator address, unless an override was given
-	if( !$::opt_C and !$::opt_c ) {
-		paraprint <<EOF;
+	if ($ok && $guess) {
+	    # use it
+	    $from = $guess;
+	} else {
+	    # verify it
+	    print "Your address [$guess]: ";
+	    $from = <>;
+	    chop $from;
+	    $from = $guess if $from eq '';
+	}
+    }
 
+    if ($from eq $cc or $me eq $cc) {
+	# Try not to copy ourselves
+	$cc = "yourself";
+    }
 
+    # Prompt for administrator address, unless an override was given
+    if( !$::opt_C and !$::opt_c ) {
+	paraprint <<EOF;
 A copy of this report can be sent to your local
-perl administrator. If the address is wrong, please 
+perl administrator. If the address is wrong, please
 correct it, or enter 'none' or 'yourself' to not send
 a copy.
-
 EOF
+	print "Local perl administrator [$cc]: ";
+	my $entry = scalar <>;
+	chop $entry;
 
-		print "Local perl administrator [$cc]: ";
-	
-		my($entry) = scalar(<>);
-		chop $entry;
-	
-		if($entry ne "") {
-			$cc = $entry;
-			if($me eq $cc) { $cc = "" }
-		}
-	
+	if ($entry ne "") {
+	    $cc = $entry;
+	    $cc = '' if $me eq $cc;
 	}
+    }
 
-	if($cc =~ /^(none|yourself|me|myself|ourselves)$/i) { $cc = "" }
-
-	$andcc = " and $cc" if $cc;
+    $cc = '' if $cc =~ /^(none|yourself|me|myself|ourselves)$/i;
+    $andcc = " and $cc" if $cc;
 
+    # Prompt for editor, if no override is given
 editor:
-	
-	# Prompt for editor, if no override is given
-	if(! $::opt_e and ! $::opt_f and ! $::opt_b) {
-		paraprint <<EOF;
-
-
+    unless ($::opt_e || $::opt_f || $::opt_b) {
+	paraprint <<EOF;
 Now you need to supply the bug report. Try to make
-the report concise but descriptive. Include any 
+the report concise but descriptive. Include any
 relevant detail. If you are reporting something
 that does not work as you think it should, please
-try to include example of both the actual 
+try to include example of both the actual
 result, and what you expected.
 
 Some information about your local
-perl configuration will automatically be included 
+perl configuration will automatically be included
 at the end of the report. If you are using any
 unusual version of perl, please try and confirm
 exactly which versions are relevant.
@@ -424,96 +389,71 @@ the name of the editor you would like to use.
 
 If you would like to use a prepared file, type
 "file", and you will be asked for the filename.
-
 EOF
-
-		print "Editor [$ed]: ";
-	
-		my($entry) =scalar(<>);
-		chop $entry;
-		
-		$usefile = 0;
-		if($entry eq "file") {
-			$usefile = 1;
-		} elsif($entry ne "") {
-			$ed = $entry;
-		} 
+	print "Editor [$ed]: ";
+	my $entry =scalar <>;
+	chop $entry;
+
+	$usefile = 0;
+	if ($entry eq "file") {
+	    $usefile = 1;
+	} elsif ($entry ne "") {
+	    $ed = $entry;
 	}
+    }
 
+    # Generate scratch file to edit report in
+    $filename = filename();
 
-	# Generate scratch file to edit report in
-	
-	{
-	my($dir) = ($Is_VMS ? 'sys$scratch:' :
-		    (($Is_MSWin32 && $ENV{'TEMP'}) ? $ENV{'TEMP'} : '/tmp/'));
-	$filename = "bugrep0$$";
-	$dir .= "\\" if $Is_MSWin32 and $dir !~ m|[\\/]$|;
-	$filename++ while -e "$dir$filename";
-	$filename = "$dir$filename";
-	}
-	
-	
-	# Prompt for file to read report from, if needed
-	
-	if( $usefile and ! $file) {
+    # Prompt for file to read report from, if needed
+    if ($usefile and !$file) {
 filename:
-		paraprint <<EOF;
-
+	paraprint <<EOF;
 What is the name of the file that contains your report?
-
 EOF
+	print "Filename: ";
+	my $entry = scalar <>;
+	chop $entry;
 
-		print "Filename: ";
-	
-		my($entry) = scalar(<>);
-		chop($entry);
-
-		if($entry eq "") {
-			paraprint <<EOF;
-			
-No filename? I'll let you go back and choose an editor again.			
-
+	if ($entry eq "") {
+	    paraprint <<EOF;
+No filename? I'll let you go back and choose an editor again.
 EOF
-			goto editor;
-		}
-		
-		if(!-f $entry or !-r $entry) {
-			paraprint <<EOF;
-			
+	    goto editor;
+	}
+
+	unless (-f $entry and -r $entry) {
+	    paraprint <<EOF;
 I'm sorry, but I can't read from `$entry'. Maybe you mistyped the name of
 the file? If you don't want to send a file, just enter a blank line and you
 can get back to the editor selection.
-
 EOF
-			goto filename;
-		}
-		$file = $entry;
-
+	    goto filename;
 	}
+	$file = $entry;
+    }
 
+    # Generate report
+    open(REP,">$filename");
+    my $reptype = $ok ? "build failure" : "bug";
 
-	# Generate report
-
-	open(REP,">$filename");
-
-	my $reptype = $ok ? "success" : "bug";
-
-	print REP <<EOF;
+    print REP <<EOF;
 This is a $reptype report for perl from $from,
 generated with the help of perlbug $Version running under perl $].
 
 EOF
 
-	if($body) {
-		print REP $body;
-	} elsif($usefile) {
-		open(F,"<$file") or die "Unable to read report file from `$file': $!\n";
-		while(<F>) {
-		print REP $_
-		}
-		close(F);
-	} else {
-		print REP <<EOF;
+    if ($body) {
+	print REP $body;
+    } elsif ($usefile) {
+	open(F, "<$file")
+		or die "Unable to read report file from `$file': $!\n";
+	while (<F>) {
+	    print REP $_
+	}
+	close(F);
+    } else {
+	print REP <<EOF;
 
 -----------------------------------------------------------------
 [Please enter your report here]
@@ -523,164 +463,138 @@ EOF
 [Please do not change anything below this line]
 -----------------------------------------------------------------
 EOF
-	}
-	
-	Dump(*REP);
-	close(REP);
-
-	# read in the report template once so that
-	# we can track whether the user does any editing.
-	# yes, *all* whitespace is ignored.
-        open(REP, "<$filename");
-        while (<REP>) {
-		s/\s+//g;
-		$REP{$_}++;
-	}
-	close(REP);
-
-}
+    }
+    Dump(*REP);
+    close(REP);
+
+    # read in the report template once so that
+    # we can track whether the user does any editing.
+    # yes, *all* whitespace is ignored.
+    open(REP, "<$filename");
+    while (<REP>) {
+	s/\s+//g;
+	$REP{$_}++;
+    }
+    close(REP);
+} # sub Query
 
 sub Dump {
-	local(*OUT) = @_;
-	
-	print REP "\n---\n";
+    local(*OUT) = @_;
 
-	print REP "This perlbug was built using Perl $config_tag1\n",
-		  "It is being executed now by  Perl $config_tag2.\n\n"
-	    if $config_tag2 ne $config_tag1;
+    print REP "\n---\n";
+    print REP "This perlbug was built using Perl $config_tag1\n",
+	    "It is being executed now by  Perl $config_tag2.\n\n"
+	if $config_tag2 ne $config_tag1;
 
-	print OUT <<EOF;
+    print OUT <<EOF;
 Site configuration information for perl $]:
 
 EOF
+    if ($::Config{cf_by} and $::Config{cf_time}) {
+	print OUT "Configured by $::Config{cf_by} at $::Config{cf_time}.\n\n";
+    }
+    print OUT Config::myconfig;
 
-	if( $::Config{cf_by} and $::Config{cf_time}) {
-		print OUT "Configured by $::Config{cf_by} at $::Config{cf_time}.\n\n";
-	}
-
-	print OUT Config::myconfig;
-
-	if (@patches) {
-		print OUT join "\n\t", "Locally applied patches:", @patches;
-                print OUT "\n";
-        };
+    if (@patches) {
+	print OUT join "\n    ", "Locally applied patches:", @patches;
+	print OUT "\n";
+    };
 
-	print OUT <<EOF;
+    print OUT <<EOF;
 
 ---
 \@INC for perl $]:
 EOF
-        for my $i (@INC) {
-	    print OUT "\t$i\n";
-        }
+    for my $i (@INC) {
+	print OUT "    $i\n";
+    }
 
-	print OUT <<EOF;
+    print OUT <<EOF;
 
 ---
 Environment for perl $]:
 EOF
-        for my $env (sort
-		     (qw(PATH LD_LIBRARY_PATH
-			 LANG PERL_BADLANG
-			 SHELL HOME LOGDIR),
-		      grep { /^(?:PERL|LC_)/ } keys %ENV)) {
-	    print OUT "    $env",
-                      exists $ENV{$env} ? "=$ENV{$env}" : ' (unset)',
-	              "\n";
-	}
-	if($verbose) {
-		print OUT "\nComplete configuration data for perl $]:\n\n";
-		my($value);
-		foreach (sort keys %::Config) {
-			$value = $::Config{$_};
-			$value =~ s/'/\\'/g;
-			print OUT "$_='$value'\n";
-		}
+    for my $env (sort
+	(qw(PATH LD_LIBRARY_PATH LANG PERL_BADLANG SHELL HOME LOGDIR),
+	grep /^(?:PERL|LC_)/, keys %ENV)
+    ) {
+	print OUT "    $env",
+		exists $ENV{$env} ? "=$ENV{$env}" : ' (unset)',
+		"\n";
+    }
+    if ($verbose) {
+	print OUT "\nComplete configuration data for perl $]:\n\n";
+	my $value;
+	foreach (sort keys %::Config) {
+	    $value = $::Config{$_};
+	    $value =~ s/'/\\'/g;
+	    print OUT "$_='$value'\n";
 	}
-}
+    }
+} # sub Dump
 
 sub Edit {
-	# Edit the report
-
-	if($usefile) {
-		$usefile = 0;
-		paraprint <<EOF;
-
+    # Edit the report
+    if ($usefile || $body) {
+	paraprint <<EOF;
 Please make sure that the name of the editor you want to use is correct.
-
 EOF
-		print "Editor [$ed]: ";
-		
-		my($entry) =scalar(<>);
-		chop $entry;
-	
-		if($entry ne "") {
-			$ed = $entry;
-		} 
-	}
-	
-tryagain:
-	if(!$usefile and !$body) {
-		my $sts = system("$ed $filename");
-		if($sts) {
-			#print "\nUnable to run editor!\n";
-			paraprint <<EOF;
+	print "Editor [$ed]: ";
+	my $entry =scalar <>;
+	chop $entry;
+	$ed = $entry unless $entry eq '';
+    }
 
+tryagain:
+    my $sts = system("$ed $filename");
+    if ($sts) {
+	paraprint <<EOF;
 The editor you chose (`$ed') could apparently not be run!
 Did you mistype the name of your editor? If so, please
-correct it here, otherwise just press Enter. 
-
+correct it here, otherwise just press Enter.
 EOF
-			print "Editor [$ed]: ";
-		
-			my($entry) =scalar(<>);
-			chop $entry;
-	
-			if($entry ne "") {
-				$ed = $entry;
-				goto tryagain;
-			} else {
-			
-			paraprint <<EOF;
+	print "Editor [$ed]: ";
+	my $entry =scalar <>;
+	chop $entry;
 
+	if ($entry ne "") {
+	    $ed = $entry;
+	    goto tryagain;
+	} else {
+	    paraprint <<EOF;
 You may want to save your report to a file, so you can edit and mail it
 yourself.
 EOF
-			}
-		} 
-	}
-
-        return if $ok;
-        # Check that we have a report that has some, eh, report in it.
-
-        my $unseen = 0;
-
-        open(REP, "<$filename");
-	# a strange way to check whether any significant editing
-	# have been done: check whether any new non-empty lines
-	# have been added. Yes, the below code ignores *any* space
-	# in *any* line.
-        while (<REP>) {
-	    s/\s+//g;
-	    $unseen++ if ($_ ne '' and not exists $REP{$_});
 	}
+    }
 
-	while ($unseen == 0) {
-	    paraprint <<EOF;
+    return if ($ok and not $::opt_n) || $body;
+    # Check that we have a report that has some, eh, report in it.
+    my $unseen = 0;
+
+    open(REP, "<$filename");
+    # a strange way to check whether any significant editing
+    # have been done: check whether any new non-empty lines
+    # have been added. Yes, the below code ignores *any* space
+    # in *any* line.
+    while (<REP>) {
+	s/\s+//g;
+	$unseen++ if $_ ne '' and not exists $REP{$_};
+    }
 
+    while ($unseen == 0) {
+	paraprint <<EOF;
 I am sorry but it looks like you did not report anything.
-
 EOF
-		print "Action (Retry Edit/Cancel) ";
-		my ($action) = scalar(<>);
-		if ($action =~ /^[re]/i) { # <R>etry <E>dit
-			goto tryagain;
-		} elsif ($action =~ /^[cq]/i) { # <C>ancel, <Q>uit
-		        Cancel();
-		}
-        }
-
-}
+	print "Action (Retry Edit/Cancel) ";
+	my ($action) = scalar(<>);
+	if ($action =~ /^[re]/i) { # <R>etry <E>dit
+	    goto tryagain;
+	} elsif ($action =~ /^[cq]/i) { # <C>ancel, <Q>uit
+	    Cancel();
+	}
+    }
+} # sub Edit
 
 sub Cancel {
     1 while unlink($filename);  # remove all versions under VMS
@@ -689,227 +603,211 @@ sub Cancel {
 }
 
 sub NowWhat {
-
-	# Report is done, prompt for further action
-	if( !$::opt_S ) {
-		while(1) {
-
-			paraprint <<EOF;
-
-
-Now that you have completed your report, would you like to send 
-the message to $address$andcc, display the message on 
+    # Report is done, prompt for further action
+    if( !$::opt_S ) {
+	while(1) {
+	    paraprint <<EOF;
+Now that you have completed your report, would you like to send
+the message to $address$andcc, display the message on
 the screen, re-edit it, or cancel without sending anything?
 You may also save the message as a file to mail at another time.
-
 EOF
-
-			print "Action (Send/Display/Edit/Cancel/Save to File): ";
-			my($action) = scalar(<>);
-			chop $action;
-
-			if( $action =~ /^(f|sa)/i ) { # <F>ile/<Sa>ve
-				print "\n\nName of file to save message in [perlbug.rep]: ";
-				my($file) = scalar(<>);
-				chop $file;
-				if($file eq "") { $file = "perlbug.rep" }
-			
-				open(FILE,">$file");
-				open(REP,"<$filename");
-				print FILE "To: $address\nSubject: $subject\n";
-				print FILE "Cc: $cc\n" if $cc;
-				print FILE "Reply-To: $from\n" if $from;
-				print FILE "\n";
-				while(<REP>) { print FILE }
-				close(REP);
-				close(FILE);
-	
-				print "\nMessage saved in `$file'.\n";
-				exit;
-
-			} elsif( $action =~ /^(d|l|sh)/i ) { # <D>isplay, <L>ist, <Sh>ow
-				# Display the message
-				open(REP,"<$filename");
-				while(<REP>) { print $_ }
-				close(REP);
-			} elsif( $action =~ /^se/i ) { # <S>end
-				# Send the message
-				print "\
-Are you certain you want to send this message?
-Please type \"yes\" if you are: ";
-				my($reply) = scalar(<STDIN>);
-				chop($reply);
-				if( $reply eq "yes" ) {
-					last;
-				} else {
-					paraprint <<EOF;
-
+	    print "Action (Send/Display/Edit/Cancel/Save to File): ";
+	    my $action = scalar <>;
+	    chop $action;
+
+	    if ($action =~ /^(f|sa)/i) { # <F>ile/<Sa>ve
+		print "\n\nName of file to save message in [perlbug.rep]: ";
+		my $file = scalar <>;
+		chop $file;
+		$file = "perlbug.rep" if $file eq "";
+
+		open(FILE, ">$file");
+		open(REP, "<$filename");
+		print FILE "To: $address\nSubject: $subject\n";
+		print FILE "Cc: $cc\n" if $cc;
+		print FILE "Reply-To: $from\n" if $from;
+		print FILE "\n";
+		while (<REP>) { print FILE }
+		close(REP);
+		close(FILE);
+
+		print "\nMessage saved in `$file'.\n";
+		exit;
+	    } elsif ($action =~ /^(d|l|sh)/i ) { # <D>isplay, <L>ist, <Sh>ow
+		# Display the message
+		open(REP, "<$filename");
+		while (<REP>) { print $_ }
+		close(REP);
+	    } elsif ($action =~ /^se/i) { # <S>end
+		# Send the message
+		print "Are you certain you want to send this message?\n"
+		    . 'Please type "yes" if you are: ';
+		my $reply = scalar <STDIN>;
+		chop $reply;
+		if ($reply eq "yes") {
+		    last;
+		} else {
+		    paraprint <<EOF;
 That wasn't a clear "yes", so I won't send your message. If you are sure
 your message should be sent, type in "yes" (without the quotes) at the
 confirmation prompt.
-
 EOF
-					
-				}
-			} elsif( $action =~ /^[er]/i ) { # <E>dit, <R>e-edit
-				# edit the message
-				Edit();
-				#system("$ed $filename");
-			} elsif( $action =~ /^[qc]/i ) { # <C>ancel, <Q>uit
-			        Cancel();
-			} elsif( $action =~ /^s/ ) {
-				paraprint <<EOF;
-
+		}
+	    } elsif ($action =~ /^[er]/i) { # <E>dit, <R>e-edit
+		# edit the message
+		Edit();
+	    } elsif ($action =~ /^[qc]/i) { # <C>ancel, <Q>uit
+		Cancel();
+	    } elsif ($action =~ /^s/) {
+		paraprint <<EOF;
 I'm sorry, but I didn't understand that. Please type "send" or "save".
 EOF
-			}
-		
-		}
+	    }
 	}
-}
-
+    }
+} # sub NowWhat
 
 sub Send {
+    # Message has been accepted for transmission -- Send the message
+    if ($::HaveSend) {
+	$msg = new Mail::Send Subject => $subject, To => $address;
+	$msg->cc($cc) if $cc;
+	$msg->add("Reply-To",$from) if $from;
+
+	$fh = $msg->open;
+	open(REP, "<$filename");
+	while (<REP>) { print $fh $_ }
+	close(REP);
+	$fh->close;
+
+	print "\nMessage sent.\n";
+    } elsif ($Is_VMS) {
+	if ( ($address =~ /@/ and $address !~ /^\w+%"/) or
+	     ($cc      =~ /@/ and $cc      !~ /^\w+%"/) ) {
+	    my $prefix;
+	    foreach (qw[ IN MX SMTP UCX PONY WINS ], '') {
+		$prefix = "$_%", last if $ENV{"MAIL\$PROTOCOL_$_"};
+	    }
+	    $address = qq[${prefix}"$address"] unless $address =~ /^\w+%"/;
+	    $cc = qq[${prefix}"$cc"] unless !$cc || $cc =~ /^\w+%"/;
+	}
+	$subject =~ s/"/""/g; $address =~ s/"/""/g; $cc =~ s/"/""/g;
+	my $sts = system(qq[mail/Subject="$subject" $filename. "$address","$cc"]);
+	if ($sts) {
+	    die <<EOF;
+Can't spawn off mail
+	(leaving bug report in $filename): $sts
+EOF
+	}
+    } else {
+	my $sendmail = "";
+	for (qw(/usr/lib/sendmail /usr/sbin/sendmail /usr/ucblib/sendmail)) {
+	    $sendmail = $_, last if -e $_;
+	}
+	if ($^O eq 'os2' and $sendmail eq "") {
+	    my $path = $ENV{PATH};
+	    $path =~ s:\\:/: ;
+	    my @path = split /$Config{'path_sep'}/, $path;
+	    for (@path) {
+		$sendmail = "$_/sendmail", last if -e "$_/sendmail";
+		$sendmail = "$_/sendmail.exe", last if -e "$_/sendmail.exe";
+	    }
+	}
 
-	# Message has been accepted for transmission -- Send the message
-	
-	if($::HaveSend) {
-
-		$msg = new Mail::Send Subject => $subject, To => $address;
-	
-		$msg->cc($cc) if $cc;
-		$msg->add("Reply-To",$from) if $from;
-	    
-		$fh = $msg->open;
-
-		open(REP,"<$filename");
-		while(<REP>) { print $fh $_ }
-		close(REP);
-	
-		$fh->close;  
-	
-		print "\nMessage sent.\n";
-	} else {
-		if ($Is_VMS) {
-			if ( ($address =~ /@/ and $address !~ /^\w+%"/) or
-			     ($cc      =~ /@/ and $cc      !~ /^\w+%"/) ){
-				my($prefix);
-				foreach (qw[ IN MX SMTP UCX PONY WINS ],'') {
-					$prefix = "$_%",last if $ENV{"MAIL\$PROTOCOL_$_"};
-				}
-				$address = qq[${prefix}"$address"] unless $address =~ /^\w+%"/;
-				$cc = qq[${prefix}"$cc"] unless !$cc || $cc =~ /^\w+%"/;
-			}
-			$subject =~ s/"/""/g; $address =~ s/"/""/g; $cc =~ s/"/""/g;
-			my($sts) = system(qq[mail/Subject="$subject" $filename. "$address","$cc"]);
-			if ($sts) { die "Can't spawn off mail\n\t(leaving bug report in $filename): $sts\n;" }
-		} else {
-			my($sendmail) = "";
-			
-			foreach (qw(/usr/lib/sendmail /usr/sbin/sendmail /usr/ucblib/sendmail))
-			{
-				$sendmail = $_, last if -e $_;
-			}
-
-			if ($^O eq 'os2' and $sendmail eq "") {
-			  my $path = $ENV{PATH};
-			  $path =~ s:\\:/: ;
-			  my @path = split /$Config{path_sep}/, $path;
-			  for (@path) {
-			    $sendmail = "$_/sendmail", last 
-			      if -e "$_/sendmail";
-			    $sendmail = "$_/sendmail.exe", last 
-			      if -e "$_/sendmail.exe";
-			  }
-			}
-			
-			paraprint(<<"EOF"), die "\n" if $sendmail eq "";
-			
+	paraprint(<<"EOF"), die "\n" if $sendmail eq "";
 I am terribly sorry, but I cannot find sendmail, or a close equivalent, and
 the perl package Mail::Send has not been installed, so I can't send your bug
 report. We apologize for the inconvenience.
 
 So you may attempt to find some way of sending your message, it has
 been left in the file `$filename'.
-
 EOF
-			
-			open(SENDMAIL,"|$sendmail -t") || die "'|$sendmail -t' failed: $|";
-			print SENDMAIL "To: $address\n";
-			print SENDMAIL "Subject: $subject\n";
-			print SENDMAIL "Cc: $cc\n" if $cc;
-			print SENDMAIL "Reply-To: $from\n" if $from;
-			print SENDMAIL "\n\n";
-			open(REP,"<$filename");
-			while(<REP>) { print SENDMAIL $_ }
-			close(REP);
-			
-			if (close(SENDMAIL)) {
-			  print "\nMessage sent.\n";
-			} else {
-			  warn "\nSendmail returned status '",$?>>8,"'\n";
-			}
-		}
-	
-	}
-
-	1 while unlink($filename);  # remove all versions under VMS
+	open(SENDMAIL, "|$sendmail -t") || die "'|$sendmail -t' failed: $!";
+	print SENDMAIL "To: $address\n";
+	print SENDMAIL "Subject: $subject\n";
+	print SENDMAIL "Cc: $cc\n" if $cc;
+	print SENDMAIL "Reply-To: $from\n" if $from;
+	print SENDMAIL "\n\n";
+	open(REP, "<$filename");
+	while (<REP>) { print SENDMAIL $_ }
+	close(REP);
 
-}
+	if (close(SENDMAIL)) {
+	    print "\nMessage sent.\n";
+	} else {
+	    warn "\nSendmail returned status '", $? >> 8, "'\n";
+	}
+    }
+    1 while unlink($filename);  # remove all versions under VMS
+} # sub Send
 
 sub Help {
-	print <<EOF; 
+    print <<EOF;
 
-A program to help generate bug reports about perl5, and mail them. 
+A program to help generate bug reports about perl5, and mail them.
 It is designed to be used interactively. Normally no arguments will
 be needed.
-	
+
 Usage:
 $0  [-v] [-a address] [-s subject] [-b body | -f file ]
     [-r returnaddress] [-e editor] [-c adminaddress | -C] [-S] [-t] [-h]
-    
+$0  [-v] [-r returnaddress] [-ok | -okay | -nok | -nokay]
+
 Simplest usage:  run "$0", and follow the prompts.
 
 Options:
 
   -v    Include Verbose configuration data in the report
-  -f    File containing the body of the report. Use this to 
+  -f    File containing the body of the report. Use this to
         quickly send a prepared message.
   -S    Send without asking for confirmation.
   -a    Address to send the report to. Defaults to `$address'.
   -c    Address to send copy of report to. Defaults to `$cc'.
   -C    Don't send copy to administrator.
-  -s    Subject to include with the message. You will be prompted 
+  -s    Subject to include with the message. You will be prompted
         if you don't supply one on the command line.
   -b    Body of the report. If not included on the command line, or
         in a file with -f, you will get a chance to edit the message.
   -r    Your return address. The program will ask you to confirm
         this if you don't give it here.
-  -e    Editor to use. 
+  -e    Editor to use.
   -t    Test mode. The target address defaults to `$testaddress'.
-  -d	Data mode (the default if you redirect or pipe output.) 
+  -d	Data mode (the default if you redirect or pipe output.)
         This prints out your configuration data, without mailing
         anything. You can use this with -v to get more complete data.
   -ok   Report successful build on this system to perl porters
-        (use alone or with -v). Only use -ok if *everything* was ok.
-        If there were *any* problems at all then don't use -ok.
+        (use alone or with -v). Only use -ok if *everything* was ok:
+        if there were *any* problems at all, use -nok.
   -okay As -ok but allow report from old builds.
-  -h    Print this help message. 
-  
+  -nok  Report unsuccessful build on this system to perl porters
+        (use alone or with -v). You must describe what went wrong
+        in the body of the report which you will be asked to edit.
+  -nokay As -nok but allow report from old builds.
+  -h    Print this help message.
+
 EOF
 }
 
+sub filename {
+    my $dir = $Is_VMS ? 'sys$scratch:'
+	: ($Is_MSWin32 && $ENV{'TEMP'}) ? $ENV{'TEMP'}
+	: '/tmp/';
+    $filename = "bugrep0$$";
+    $dir .= "\\" if $Is_MSWin32 and $dir !~ m|[\\/]$|;
+    $filename++ while -e "$dir$filename";
+    $filename = "$dir$filename";
+}
+
 sub paraprint {
     my @paragraphs = split /\n{2,}/, "@_";
     print "\n\n";
     for (@paragraphs) {   # implicit local $_
-    	s/(\S)\s*\n/$1 /g;
-	    write;
-	    print "\n";
+	s/(\S)\s*\n/$1 /g;
+	write;
+	print "\n";
     }
-                       
 }
-                            
 
 format STDOUT =
 ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~
@@ -929,12 +827,13 @@ S<[ B<-b> I<body> | B<-f> I<file> ]> S<[ B<-r> I<returnaddress> ]>
 S<[ B<-e> I<editor> ]> S<[ B<-c> I<adminaddress> | B<-C> ]>
 S<[ B<-S> ]> S<[ B<-t> ]>  S<[ B<-d> ]>  S<[ B<-h> ]>
 
-B<perlbug> S<[ B<-v> ]> S<[ B<-r> I<returnaddress> ]> S<[ B<-ok> | B<okay> ]>
+B<perlbug> S<[ B<-v> ]> S<[ B<-r> I<returnaddress> ]>
+S<[ B<-ok> | B<-okay> | B<-nok> | B<-nokay> ]>
 
 =head1 DESCRIPTION
 
 A program to help generate bug reports about perl or the modules that
-come with it, and mail them. 
+come with it, and mail them.
 
 If you have found a bug with a non-standard port (one that was not part
 of the I<standard distribution>), a binary distribution, or a
@@ -1073,7 +972,7 @@ with B<-v> to get more complete data.
 
 =item B<-e>
 
-Editor to use. 
+Editor to use.
 
 =item B<-f>
 
@@ -1097,6 +996,21 @@ system is less than 60 days old.
 
 As B<-ok> except it will report on older systems.
 
+=item B<-nok>
+
+Report unsuccessful build on this system.  Forces B<-C>.  Forces and
+supplies a value for B<-s>, then requires you to edit the report
+and say what went wrong.  Alternatively, a prepared report may be
+supplied using B<-f>.  Only prompts for a return address if it
+cannot guess it (for use with B<make>). Honors return address
+specified with B<-r>.  You can use this with B<-v> to get more
+complete data.  Only makes a report if this system is less than 60
+days old.
+
+=item B<-nokay>
+
+As B<-nok> except it will report on older systems.
+
 =item B<-r>
 
 Your return address.  The program will ask you to confirm its default
@@ -1126,8 +1040,9 @@ Include verbose configuration data in the report.
 Kenneth Albanowski (E<lt>kjahds@kjahds.comE<gt>), subsequently I<doc>tored
 by Gurusamy Sarathy (E<lt>gsar@umich.eduE<gt>), Tom Christiansen
 (E<lt>tchrist@perl.comE<gt>), Nathan Torkington (E<lt>gnat@frii.comE<gt>),
-Charles F. Randall (E<lt>cfr@pobox.comE<gt>) and
-Mike Guy (E<lt>mjtg@cam.a.ukE<gt>).
+Charles F. Randall (E<lt>cfr@pobox.comE<gt>), Mike Guy
+(E<lt>mjtg@cam.a.ukE<gt>), Dominic Dunlop (E<lt>domo@computer.orgE<gt>)
+and Hugo van der Sanden (E<lt>hv@crypt0.demon.co.ukE<gt>).
 
 =head1 SEE ALSO