X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=utils%2Fperlbug.PL;h=de94e6e13d3b1930c1218c030601d450409a612e;hb=ebab5fdda82b63a33ca5426cdae823563f351ee3;hp=2b11012fae09b13f19940772b2e1105cb7c71e1a;hpb=4935d2c2574073146066c5d9b654a47d71a2cc2a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/utils/perlbug.PL b/utils/perlbug.PL
index 2b11012..de94e6e 100644
--- a/utils/perlbug.PL
+++ b/utils/perlbug.PL
@@ -2,6 +2,8 @@
 
 use Config;
 use File::Basename qw(&basename &dirname);
+use Cwd;
+use File::Spec::Functions;
 
 # List explicitly here the variables you want Configure to
 # generate.  Metaconfig only looks for shell variables, so you
@@ -9,24 +11,70 @@ use File::Basename qw(&basename &dirname);
 # %Config entries.  Thus you write
 #  $startperl
 # to ensure Configure will look for $Config{startperl}.
+#  $perlpath
 
 # This forces PL files to create target in same directory as PL file.
 # This is so that make depend always knows where to find PL derivatives.
+$origdir = cwd;
 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
+
+open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h")
+    or die "Can't open patchlevel.h: $!";
+
+my $patchlevel_date = (stat PATCH_LEVEL)[9];
+
+while (<PATCH_LEVEL>) {
+    last if $_ =~ /^\s*static\s+(?:const\s+)?char.*?local_patches\[\]\s*=\s*{\s*$/;
+}
+
+if (! defined($_)) {
+    warn "Warning: local_patches section not found in patchlevel.h\n";
+}
+
+my @patches;
+while (<PATCH_LEVEL>) {
+    last if /^\s*}/;
+    chomp;
+    s/^\s+,?\s*"?//;
+    s/"?\s*,?$//;
+    s/(['\\])/\\$1/g;
+    push @patches, $_ unless $_ eq 'NULL';
+}
+my $patch_desc = "'" . join("',\n    '", @patches) . "'";
+my $patch_tags = join "", map /(\S+)/ ? "+$1 " : (), @patches;
+
+close(PATCH_LEVEL) or die "Error closing patchlevel.h: $!";
+
+# TO DO (prehaps): store/embed $Config::config_sh into perlbug. When perlbug is
+# used, compare $Config::config_sh with the stored version. If they differ then
+# append a list of individual differences to the bug report.
+
 
 print "Extracting $file (with variable substitutions)\n";
 
 # In this section, perl variables will be expanded during extraction.
 # You can use $Config{...} to use Configure variables.
 
+my $extract_version = sprintf("%vd", $^V);
+
 print OUT <<"!GROK!THIS!";
 $Config{startperl}
     eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
 	if \$running_under_some_shell;
+
+my \$config_tag1 = '$extract_version - $Config{cf_time}';
+
+my \$patchlevel_date = $patchlevel_date;
+my \$patch_tags = '$patch_tags';
+my \@patches = (
+    $patch_desc
+);
 !GROK!THIS!
 
 # In the following, perl variables are not expanded during extraction.
@@ -34,22 +82,23 @@ $Config{startperl}
 print OUT <<'!NO!SUBS!';
 
 use Config;
+use File::Spec;		# keep perlbug Perl 5.005 compatible
 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 "");
+    # use secure tempfiles wherever possible
+    eval "require File::Temp;";
+    $::HaveTemp = ($@ eq "");
+};
 
-my($Version) = "1.18";
+my $Version = "1.35";
 
 # 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.
@@ -70,130 +119,238 @@ my($Version) = "1.18";
 # Changed in 1.16 to include @INC, and allow user to re-edit if no changes.
 # Changed in 1.17 Win32 support added.  GSAR 97-04-12
 # Changed in 1.18 add '-ok' option for reporting build success. CFR 97-06-18
+# Changed in 1.19 '-ok' default not '-v'
+#                 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
+# Changed in 1.23 Restore -ok(ay): say 'success'; don't prompt
+# Changed in 1.24 Added '-F<file>' to save report HVDS 98-07-01
+# Changed in 1.25 Warn on failure to open save file. HVDS 98-07-12
+# Changed in 1.26 Don't require -t STDIN for -ok. HVDS 98-07-15
+# Changed in 1.27 Added Mac OS and File::Spec support CNANDOR 99-07-27
+# Changed in 1.28 Additional questions for Perlbugtron RFOLEY 20.03.2000
+# Changed in 1.29 Perlbug(tron): auto(-ok), short prompts RFOLEY 05-05-2000
+# Changed in 1.30 Added warnings on failure to open files MSTEVENS 13-07-2000
+# Changed in 1.31 Add checks on close().Fix my $var unless. TJENNESS 26-07-2000
+# Changed in 1.32 Use File::Spec->tmpdir TJENNESS 20-08-2000
+# Changed in 1.33 Don't require -t STDOUT for -ok.
+# Changed in 1.34 Added Message-Id RFOLEY 18-06-2002 
+# Changed in 1.35 Use File::Temp (patch from Solar Designer) NWCLARK 28-02-2004
 
 # 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, 
-    $fh, $me, $Is_MSWin32, $Is_VMS, $msg, $body, $andcc, %REP, $ok);
+my( $file, $usefile, $cc, $address, $perlbug, $testaddress, $filename, $messageid, $domain,
+    $subject, $from, $verbose, $ed, $outfile, $Is_MacOS, $category, $severity,
+    $fh, $me, $Is_MSWin32, $Is_Linux, $Is_VMS, $msg, $body, $andcc, %REP, $ok,
+    $Is_OpenBSD);
 
-Init();
+my $perl_version = $^V ? sprintf("%vd", $^V) : $];
 
-if($::opt_h) { Help(); exit; }
+my $config_tag2 = "$perl_version - $Config{cf_time}";
 
-if(!-t STDIN) {
-	paraprint <<EOF;
-Please use perlbug interactively. If you want to 
+Init();
+
+if ($::opt_h) { Help(); exit; }
+if ($::opt_d) { Dump(*STDOUT); exit; }
+if (!-t STDIN && !($ok and not $::opt_n)) {
+    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($::opt_d or !-t STDOUT) { Dump(*STDOUT); exit; }
-
 Query();
-Edit() unless $usefile;
+Edit() unless $usefile || ($ok and not $::opt_n);
 NowWhat();
 Send();
 
 exit;
 
+sub ask_for_alternatives { # (category|severity)
+    my $name = shift;
+    my %alts = (
+	'category' => {
+	    'default' => 'core',
+	    'ok'      => 'install',
+	    'opts'    => [qw(core docs install library utilities)], # patch, notabug
+	},
+	'severity' => {
+	    'default' => 'low',
+	    'ok'      => 'none',
+	    'opts'    => [qw(critical high medium low wishlist none)], # zero
+	},
+    );
+    die "Invalid alternative($name) requested\n" unless grep(/^$name$/, keys %alts);
+    my $alt = "";
+    if ($ok) {
+	$alt = $alts{$name}{'ok'};
+    } else {
+ 	my @alts = @{$alts{$name}{'opts'}};
+	paraprint <<EOF;
+Please pick a \u$name from the following:
+
+    @alts
+
+EOF
+	my $err = 0;
+	do {
+	    if ($err++ > 5) {
+		die "Invalid $name: aborting.\n";
+	    }
+	    print "Please enter a \u$name [$alts{$name}{'default'}]: ";
+	    $alt = <>;
+	    chomp $alt;
+	    if ($alt =~ /^\s*$/) {
+		$alt = $alts{$name}{'default'};
+	    }
+	} while !((($alt) = grep(/^$alt/i, @alts)));
+    }
+    lc $alt;
+}
+
 sub Init {
- 
-	# -------- Setup --------
+    # -------- Setup --------
 
-	$Is_MSWin32 = $^O eq 'MSWin32';
-	$Is_VMS = $^O eq 'VMS';
+    $Is_MSWin32 = $^O eq 'MSWin32';
+    $Is_VMS = $^O eq 'VMS';
+    $Is_Linux = lc($^O) eq 'linux';
+    $Is_OpenBSD = lc($^O) eq 'openbsd';
+    $Is_MacOS = $^O eq 'MacOS';
 
-	getopts("dhva:s:b:f:r:e:SCc:to:");
-	
+    @ARGV = split m/\s+/,
+        MacPerl::Ask('Provide command-line args here (-h for help):')
+        if $Is_MacOS && $MacPerl::Version =~ /App/;
 
-	# This comment is needed to notify metaconfig that we are
-	# using the $perladmin, $cf_by, and $cf_time definitions.
+    if (!getopts("Adhva:s:b:f:F:r:e:SCc:to:n:")) { Help(); exit; };
 
+    # 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';
+    # -------- Configuration ---------
 
-	
-	# Test address
-	$testaddress = 'perlbug-test@perl.com';
-	
-	# Target address
-	$address = $::opt_a || ($::opt_t ? $testaddress : $perlbug);
+    # perlbug address
+    $perlbug = 'perlbug@perl.org';
+
+    # Test address
+    $testaddress = 'perlbug-test@perl.org';
+
+    # 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;
 
-	# Users address, used in message and in Reply-To header
-	$from = $::opt_r || "";
+    # Subject of bug-report message
+    $subject = $::opt_s || "";
 
-	# Include verbose configuration information
-	$verbose = $::opt_v || 0;
+    # Send a file
+    $usefile = ($::opt_f || 0);
 
-	# Subject of bug-report message
-	$subject = $::opt_s || "";
+    # File to send as report
+    $file = $::opt_f || "";
 
-	# Send a file
-	$usefile = ($::opt_f || 0);
+    # File to output to
+    $outfile = $::opt_F || "";
+
+    # Body of report
+    $body = $::opt_b || "";
 	
-	# 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' ) {
-		# force these options
-		$::opt_S = 1; # don't prompt for send
-		$::opt_C = 1; # don't send a copy to the local admin
-		$::opt_v = 1; $verbose = 1;
-		$::opt_s = 1; $subject = "OK: perl $] on "
-                                         . $::Config{'osname'} . ' '
-                                         . $::Config{'osvers'};
-		$::opt_b = 1; $body    = "Perl reported to build OK on this system\n";
-		$ok = 1;
-	    }
-	    else {
-		Help();
+    # Editor
+    $ed = $::opt_e || $ENV{VISUAL} || $ENV{EDITOR} || $ENV{EDIT}
+	|| ($Is_VMS && "edit/tpu")
+	|| ($Is_MSWin32 && "notepad")
+	|| ($Is_MacOS && '')
+	|| "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
+	    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 $perl_version ${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'}
+    );
+
+    if ($::HaveUtil) {
+		$domain = Mail::Util::maildomain();
+    } elsif ($Is_MSWin32) {
+		$domain = $ENV{'USERDOMAIN'};
+    } else {
+		require Sys::Hostname;
+		$domain = Sys::Hostname::hostname();
+    }
 
+    # Message-Id - rjsf
+    $messageid = "<$::Config{'version'}_${$}_".time."\@$domain>"; 
 
-sub Query {
+    # My username
+    $me = $Is_MSWin32 ? $ENV{'USERNAME'}
+	    : $^O eq 'os2' ? $ENV{'USER'} || $ENV{'LOGNAME'}
+	    : $Is_MacOS ? $ENV{'USER'}
+	    : eval { getpwuid($<) };	# May be missing
+
+    $from = $::Config{'cf_email'}
+       if !$from && $::Config{'cf_email'} && $::Config{'cf_by'} && $me &&
+               ($me eq $::Config{'cf_by'});
+} # sub Init
 
-	# Explain what perlbug is
-    if ( ! $ok ) {
+sub Query {
+    # 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
@@ -205,159 +362,123 @@ 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 (TrivialSubject($subject)) {
+	$subject = '';
+    }
 
-	# 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 
+    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";
-			}
-		}
-	}
-	
 
-	# 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'};
-		} elsif ($Is_VMS) {
-			require Sys::Hostname;
-			$domain = Sys::Hostname::hostname();
+	my $err = 0;
+	do {
+	    print "Subject: ";
+	    $subject = <>;
+	    chomp $subject;
+	    if ($err++ == 5) {
+		die "Aborting.\n";
+	    }
+	} while (TrivialSubject($subject));
+    }
+
+    # Prompt for return address, if needed
+    unless ($from) {
+	# Try and guess return address
+	my $guess;
+
+	$guess = $ENV{'REPLY-TO'} || $ENV{'REPLYTO'} || '';
+        if ($Is_MacOS) {
+            require Mac::InternetConfig;
+            $guess = $Mac::InternetConfig::InternetConfig{
+                Mac::InternetConfig::kICEmail()
+            };
+        }
+
+	unless ($guess) {
+		# move $domain to where we can use it elsewhere	
+        if ($domain) {
+		if ($Is_VMS && !$::Config{'d_socket'}) {
+		    $guess = "$domain\:\:$me";
 		} else {
-			$domain = `hostname`.".".`domainname`;
-			$domain =~ s/[\r\n]+//g;
+		    $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";
 	}
 
+	if ($ok && $guess) {
+	    # use it
+	    $from = $guess;
+	} else {
+	    # verify it
+	    print "Your address [$guess]: ";
+	    $from = <>;
+	    chomp $from;
+	    $from = $guess if $from eq '';
+	}
+    }
 
-	# Prompt for administrator address, unless an override was given
-	if( !$::opt_C and !$::opt_c ) {
-		paraprint <<EOF;
-
+    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 <>;
+	chomp $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.
@@ -369,94 +490,77 @@ 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 <>;
+	chomp $entry;
+
+	$usefile = 0;
+	if ($entry eq "file") {
+	    $usefile = 1;
+	} elsif ($entry ne "") {
+	    $ed = $entry;
 	}
+    }
 
+    # Prompt for category of bug
+    $category ||= ask_for_alternatives('category');
 
-	# 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) {
-filename:
-		paraprint <<EOF;
+    # Prompt for severity of bug
+    $severity ||= ask_for_alternatives('severity');
 
-What is the name of the file that contains your report?
+    # Generate scratch file to edit report in
+    $filename = filename();
 
+    # Prompt for file to read report from, if needed
+    if ($usefile and !$file) {
+filename:
+	paraprint <<EOF;
+What is the name of the file that contains your report?
 EOF
+	print "Filename: ";
+	my $entry = scalar <>;
+	chomp $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") or die "Unable to create report file `$filename': $!\n";
+    my $reptype = !$ok ? "bug" : $::opt_n ? "build failure" : "success";
 
-	# Generate report
-
-	open(REP,">$filename");
-
-	print REP <<EOF;
-This is a bug report for perl from $from,
-generated with the help of perlbug $Version running under perl $].
+    print REP <<EOF;
+This is a $reptype report for perl from $from,
+generated with the help of perlbug $Version running under perl $perl_version.
 
 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) or die "Error closing `$file': $!";
+    } else {
+	print REP <<EOF;
 
 -----------------------------------------------------------------
 [Please enter your report here]
@@ -466,155 +570,163 @@ 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) or die "Error closing report file: $!";
+
+    # 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") or die "Unable to open report file `$filename': $!\n";
+    while (<REP>) {
+	s/\s+//g;
+	$REP{$_}++;
+    }
+    close(REP) or die "Error closing report file `$filename': $!";
+} # sub Query
 
 sub Dump {
-	local(*OUT) = @_;
-	
-	print OUT <<EOF;
+    local(*OUT) = @_;
 
+    print OUT <<EFF;
 ---
-Site configuration information for perl $]:
+Flags:
+    category=$category
+    severity=$severity
+EFF
+    if ($::opt_A) {
+	print OUT <<EFF;
+    ack=no
+EFF
+    }
+    print OUT <<EFF;
+---
+EFF
+    print OUT "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;
 
-EOF
+    print OUT <<EOF;
+Site configuration information for perl $perl_version:
 
-	if( $::Config{cf_by} and $::Config{cf_time}) {
-		print OUT "Configured by $::Config{cf_by} at $::Config{cf_time}.\n\n";
-	}
+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;
 
-	print OUT Config::myconfig;
+    if (@patches) {
+	print OUT join "\n    ", "Locally applied patches:", @patches;
+	print OUT "\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";
-		}
-	}
-	print OUT <<EOF;
+    print OUT <<EOF;
 
 ---
-\@INC for perl $]:
+\@INC for perl $perl_version:
 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 $]:
+Environment for perl $perl_version:
 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";
+    my @env =
+        qw(PATH LD_LIBRARY_PATH LANG PERL_BADLANG SHELL HOME LOGDIR LANGUAGE);
+    push @env, $Config{ldlibpthname} if $Config{ldlibpthname} ne '';
+    push @env, grep /^(?:PERL|LC_|LANG|CYGWIN)/, keys %ENV;
+    my %env;
+    @env{@env} = @env;
+    for my $env (sort keys %env) {
+	print OUT "    $env",
+		exists $ENV{$env} ? "=$ENV{$env}" : ' (unset)',
+		"\n";
+    }
+    if ($verbose) {
+	print OUT "\nComplete configuration data for perl $perl_version:\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 <>;
+	chomp $entry;
+	$ed = $entry unless $entry eq '';
+    }
 
+tryagain:
+    my $sts;
+    $sts = system("$ed $filename") unless $Is_MacOS;
+    if ($Is_MacOS) {
+        require ExtUtils::MakeMaker;
+        ExtUtils::MM_MacOS::launch_file($filename);
+        paraprint <<EOF;
+Press Enter when done.
+EOF
+        scalar <>;
+    }
+    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 <>;
+	chomp $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") or die "Couldn't open `$filename': $!\n";
+    # 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
@@ -623,224 +735,260 @@ 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 
-the screen, re-edit it, or cancel without sending anything?
+    # 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, display/change the subject,
+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;
-
+      retry:
+	    print "Action (Send/Display/Edit/Subject/Save to File): ";
+	    my $action = scalar <>;
+	    chomp $action;
+
+	    if ($action =~ /^(f|sa)/i) { # <F>ile/<Sa>ve
+		my $file_save = $outfile || "perlbug.rep";
+		print "\n\nName of file to save message in [$file_save]: ";
+		my $file = scalar <>;
+		chomp $file;
+		$file = $file_save if $file eq "";
+
+		unless (open(FILE, ">$file")) {
+		    print "\nError opening $file: $!\n\n";
+		    goto retry;
+		}
+		open(REP, "<$filename") or die "Couldn't open file `$filename': $!\n";
+		print FILE "To: $address\nSubject: $subject\n";
+		print FILE "Cc: $cc\n" if $cc;
+		print FILE "Reply-To: $from\n" if $from;
+		print FILE "Message-Id: $messageid\n" if $messageid;
+		print FILE "\n";
+		while (<REP>) { print FILE }
+		close(REP) or die "Error closing report file `$filename': $!";
+		close(FILE) or die "Error closing $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") or die "Couldn't open file `$filename': $!\n";
+		while (<REP>) { print $_ }
+		close(REP) or die "Error closing report file `$filename': $!";
+	    } elsif ($action =~ /^su/i) { # <Su>bject
+		print "Subject: $subject\n";
+		print "If the above subject is fine, just press Enter.\n";
+		print "If not, type in the new subject.\n";
+		print "Subject: ";
+		my $reply = scalar <STDIN>;
+		chomp $reply;
+		if ($reply ne '') {
+		    unless (TrivialSubject($reply)) {
+			$subject = $reply;
+			print "Subject: $subject\n";
+		    }
+		}
+	    } 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>;
+		chomp $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/i) {
+		paraprint <<EOF;
 I'm sorry, but I didn't understand that. Please type "send" or "save".
 EOF
-			}
-		
-		}
+	    }
 	}
+    }
+} # sub NowWhat
+
+sub TrivialSubject {
+    my $subject = shift;
+    if ($subject =~
+	/^(y(es)?|no?|help|perl( (bug|problem))?|bug|problem)$/i ||
+	length($subject) < 4 ||
+	$subject !~ /\s/) {
+	print "\nThat doesn't look like a good subject.  Please be more verbose.\n\n";
+        return 1;
+    } else {
+	return 0;
+    }
 }
 
-
 sub Send {
+    # Message has been accepted for transmission -- Send the message
+    if ($outfile) {
+	open SENDMAIL, ">$outfile" or die "Couldn't open '$outfile': $!\n";
+	goto sendout;
+    }
 
-	# Message has been accepted for transmission -- Send the message
-	
-	if($::HaveSend) {
+    # on linux certain mail implementations won't accept the subject
+    # as "~s subject" and thus the Subject header will be corrupted
+    # so don't use Mail::Send to be safe
+    if ($::HaveSend && !$Is_Linux && !$Is_OpenBSD) {
+	$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") or die "Couldn't open `$filename': $!\n";
+	while (<REP>) { print $fh $_ }
+	close(REP) or die "Error closing $filename: $!";
+	$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";
+	    }
+	}
 
-		$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");
-			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";
-			}
-		}
-	
+	open(SENDMAIL, "|$sendmail -t -oi") || die "'|$sendmail -t -oi' failed: $!";
+sendout:
+	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 "Message-Id: $messageid\n" if $messageid;
+	print SENDMAIL "\n\n";
+	open(REP, "<$filename") or die "Couldn't open `$filename': $!\n";
+	while (<REP>) { print SENDMAIL $_ }
+	close(REP) or die "Error closing $filename: $!";
+
+	if (close(SENDMAIL)) {
+	    printf "\nMessage %s.\n", $outfile ? "saved" : "sent";
+	} else {
+	    warn "\nSendmail returned status '", $? >> 8, "'\n";
 	}
-
-	1 while unlink($filename);  # remove all versions under VMS
-
-}
+    }
+    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 ]
+$0  [-v] [-a address] [-s subject] [-b body | -f inpufile ] [ -F outputfile ]
     [-r returnaddress] [-e editor] [-c adminaddress | -C] [-S] [-t] [-h]
-    
+$0  [-v] [-r returnaddress] [-A] [-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.
+  -F    File to output the resulting mail message to, instead of mailing.
   -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.) 
-        This prints out your configuration data, without mailing
+  -d    Data mode.  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 sytem to perl porters (use alone).
-  -h    Print this help message. 
-  
+  -A    Don't send a bug received acknowledgement to the return address.
+  -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, use -nok.
+  -okay As -ok but allow report from old builds.
+  -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 {
+    if ($::HaveTemp) {
+	# Good. Use a secure temp file
+	my ($fh, $filename) = File::Temp::tempfile(UNLINK => 1);
+	close($fh);
+	return $filename;
+    } else {
+	# Bah. Fall back to doing things less securely.
+	my $dir = File::Spec->tmpdir();
+	$filename = "bugrep0$$";
+	$filename++ while -e File::Spec->catfile($dir, $filename);
+	$filename = File::Spec->catfile($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 =
 ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~
@@ -856,16 +1004,18 @@ perlbug - how to submit bug reports on Perl
 =head1 SYNOPSIS
 
 B<perlbug> S<[ B<-v> ]> S<[ B<-a> I<address> ]> S<[ B<-s> I<subject> ]>
-S<[ B<-b> I<body> | B<-f> I<file> ]> S<[ B<-r> I<returnaddress> ]>
+S<[ B<-b> I<body> | B<-f> I<inputfile> ]> S<[ B<-F> I<outputfile> ]>
+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> ]>
+S<[ B<-S> ]> S<[ B<-t> ]>  S<[ B<-d> ]>  S<[ B<-A> ]>  S<[ B<-h> ]>
 
-B<perlbug> S<[ B<-r> I<returnaddress> ]> B<-ok>
+B<perlbug> S<[ B<-v> ]> S<[ B<-r> I<returnaddress> ]>
+ S<[ B<-A> ]> 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
@@ -878,7 +1028,7 @@ will be needed.  Simply run it, and follow the prompts.
 
 If you are unable to run B<perlbug> (most likely because you don't have
 a working setup to send mail that perlbug recognizes), you may have to
-compose your own report, and email it to B<perlbug@perl.com>.  You might
+compose your own report, and email it to B<perlbug@perl.org>.  You might
 find the B<-d> option useful to get summary information in that case.
 
 In any case, when reporting a bug, please make sure you have run through
@@ -886,7 +1036,7 @@ this checklist:
 
 =over 4
 
-=item What version of perl you are running?
+=item What version of Perl you are running?
 
 Type C<perl -v> at the command line to find out.
 
@@ -894,22 +1044,29 @@ Type C<perl -v> at the command line to find out.
 
 Look at http://www.perl.com/ to find out.  If it is not the latest
 released version, get that one and see whether your bug has been
-fixed.  Note that bug reports about old versions of perl, especially
+fixed.  Note that bug reports about old versions of Perl, especially
 those prior to the 5.0 release, are likely to fall upon deaf ears.
 You are on your own if you continue to use perl1 .. perl4.
 
 =item Are you sure what you have is a bug?
 
 A significant number of the bug reports we get turn out to be documented
-features in perl.  Make sure the behavior you are witnessing doesn't fall
+features in Perl.  Make sure the behavior you are witnessing doesn't fall
 under that category, by glancing through the documentation that comes
-with perl (we'll admit this is no mean task, given the sheer volume of
+with Perl (we'll admit this is no mean task, given the sheer volume of
 it all, but at least have a look at the sections that I<seem> relevant).
 
 Be aware of the familiar traps that perl programmers of various hues
 fall into.  See L<perltrap>.
 
-Try to study the problem under the perl debugger, if necessary.
+Check in L<perldiag> to see what any Perl error message(s) mean.
+If message isn't in perldiag, it probably isn't generated by Perl.
+Consult your operating system documentation instead.
+
+If you are on a non-UNIX platform check also L<perlport>, as some
+features may be unimplemented or work differently.
+
+Try to study the problem under the Perl debugger, if necessary.
 See L<perldebug>.
 
 =item Do you have a proper test case?
@@ -924,12 +1081,23 @@ A good test case is almost always a good candidate to be on the perl
 test suite.  If you have the time, consider making your test case so
 that it will readily fit into the standard test suite.
 
+Remember also to include the B<exact> error messages, if any.
+"Perl complained something" is not an exact error message.
+
+If you get a core dump (or equivalent), you may use a debugger
+(B<dbx>, B<gdb>, etc) to produce a stack trace to include in the bug
+report.  NOTE: unless your Perl has been compiled with debug info
+(often B<-g>), the stack trace is likely to be somewhat hard to use
+because it will most probably contain only the function names and not
+their arguments.  If possible, recompile your Perl with debug info and
+reproduce the dump and the stack trace.
+
 =item Can you describe the bug in plain English?
 
 The easier it is to understand a reproducible bug, the more likely it
 will be fixed.  Anything you can provide by way of insight into the
-problem helps a great deal.  In other words, try to analyse the
-problem to the extent you feel qualified and report your discoveries.
+problem helps a great deal.  In other words, try to analyze the
+problem (to the extent you can) and report your discoveries.
 
 =item Can you fix the bug yourself?
 
@@ -938,7 +1106,7 @@ definitely be fixed.  Use the C<diff> program to generate your patches
 (C<diff> is being maintained by the GNU folks as part of the B<diffutils>
 package, so you should be able to get it from any of the GNU software
 repositories).  If you do submit a patch, the cool-dude counter at
-perlbug@perl.com will register you as a savior of the world.  Your
+perlbug@perl.org will register you as a savior of the world.  Your
 patch may be returned with requests for changes, or requests for more
 detailed explanations about your fix.
 
@@ -958,16 +1126,21 @@ B<perlbug> will, amongst other things, ensure your report includes
 crucial information about your version of perl.  If C<perlbug> is unable
 to mail your report after you have typed it in, you may have to compose
 the message yourself, add the output produced by C<perlbug -d> and email
-it to B<perlbug@perl.com>.  If, for some reason, you cannot run
+it to B<perlbug@perl.org>.  If, for some reason, you cannot run
 C<perlbug> at all on your system, be sure to include the entire output
 produced by running C<perl -V> (note the uppercase V).
 
+Whether you use C<perlbug> or send the email manually, please make
+your Subject line informative.  "a bug" not informative.  Neither is
+"perl crashes" nor "HELP!!!".  These don't help.
+A compact description of what's wrong is fine.
+
 =back
 
 Having done your bit, please be prepared to wait, to be told the bug
-is in your code, or even to get no reply at all.  The perl maintainers
-are busy folks, so if your problem is a small one or if it is
-difficult to understand, they may not respond with a personal reply.
+is in your code, or even to get no reply at all.  The Perl maintainers
+are busy folks, so if your problem is a small one or if it is difficult
+to understand or already known, they may not respond with a personal reply.
 If it is important to you that your bug be fixed, do monitor the
 C<Changes> file in any development releases since the time you submitted
 the bug, and encourage the maintainers with kind words (but never any
@@ -980,7 +1153,14 @@ version of perl comes out and your bug is still present.
 
 =item B<-a>
 
-Address to send the report to.  Defaults to `perlbug@perl.com'.
+Address to send the report to.  Defaults to B<perlbug@perl.org>.
+
+=item B<-A>
+
+Don't send a bug received acknowledgement to the reply address.
+Generally it is only a sensible to use this option if you are a
+perl maintainer actively watching perl porters for your message to
+arrive.
 
 =item B<-b>
 
@@ -1004,23 +1184,50 @@ with B<-v> to get more complete data.
 
 =item B<-e>
 
-Editor to use. 
+Editor to use.
 
 =item B<-f>
 
 File containing the body of the report.  Use this to quickly send a
 prepared message.
 
+=item B<-F>
+
+File to output the results to instead of sending as an email. Useful
+particularly when running perlbug on a machine with no direct internet
+connection.
+
 =item B<-h>
 
 Prints a brief summary of the options.
 
 =item B<-ok>
 
-Report successful build on this system to perl porters. Forces B<-S>,
-B<-C>, and B<-v>. Forces and supplies values for B<-s> and B<-b>. Only
+Report successful build on this system to perl porters. Forces B<-S>
+and B<-C>. Forces and supplies values for B<-s> and B<-b>. Only
 prompts for a return address if it cannot guess it (for use with
-B<make>). Honors return address specified with B<-r>.
+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<-okay>
+
+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>
 
@@ -1038,7 +1245,7 @@ supply one on the command line.
 
 =item B<-t>
 
-Test mode.  The target address defaults to `perlbug-test@perl.com'.
+Test mode.  The target address defaults to B<perlbug-test@perl.org>.
 
 =item B<-v>
 
@@ -1049,13 +1256,19 @@ Include verbose configuration data in the report.
 =head1 AUTHORS
 
 Kenneth Albanowski (E<lt>kjahds@kjahds.comE<gt>), subsequently I<doc>tored
-by Gurusamy Sarathy (E<lt>gsar@umich.eduE<gt>), Tom Christiansen
+by Gurusamy Sarathy (E<lt>gsar@activestate.comE<gt>), Tom Christiansen
 (E<lt>tchrist@perl.comE<gt>), Nathan Torkington (E<lt>gnat@frii.comE<gt>),
-and Charles F. Randall (E<lt>cfr@pobox.comE<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>),
+Hugo van der Sanden (E<lt>hv@crypt.org<gt>),
+Jarkko Hietaniemi (E<lt>jhi@iki.fiE<gt>), Chris Nandor
+(E<lt>pudge@pobox.comE<gt>), Jon Orwant (E<lt>orwant@media.mit.eduE<gt>,
+and Richard Foley (E<lt>richard@rfi.netE<gt>).
 
 =head1 SEE ALSO
 
-perl(1), perldebug(1), perltrap(1), diff(1), patch(1)
+perl(1), perldebug(1), perldiag(1), perlport(1), perltrap(1),
+diff(1), patch(1), dbx(1), gdb(1)
 
 =head1 BUGS
 
@@ -1068,4 +1281,4 @@ None known (guess what must have been used to report them?)
 close OUT or die "Can't close $file: $!";
 chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
 exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
-
+chdir $origdir;