Fix merge issues, remove excess files - match perl-5.28.1 dist

looking good sthen@, Great! bluhm@

11 files changed, 114 insertions, 1519 deletions

diff --git a/gnu/usr.bin/perl/utils/Makefile.PL b/gnu/usr.bin/perl/utils/Makefile.PL
index 640dac255bf..f9f80ed451d 100644
--- a/gnu/usr.bin/perl/utils/Makefile.PL
+++ b/gnu/usr.bin/perl/utils/Makefile.PL
@@ -13,7 +13,7 @@ if (@ARGV) {
 # attempting to move the work from them to the extension directories and
 # ExtUtils::MakeMaker.
 
-require 'regen/regen_lib.pl';
+require './regen/regen_lib.pl';
 
 my $target = 'utils/Makefile';
 print "Extracting $target (with variable substitutions)\n";
@@ -35,17 +35,15 @@ print $fh <<'EOT';
 # Files to be built with variable substitution after miniperl is
 # available.  Dependencies handled manually below (for now).
 
-pl = c2ph.PL corelist.PL cpan.PL h2ph.PL h2xs.PL instmodsh.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL prove.PL splain.PL libnetcfg.PL piconv.PL enc2xs.PL encguess.PL xsubpp.PL pod2html.PL
-plextract = c2ph corelist cpan h2ph h2xs instmodsh perlbug perldoc perlivp pl2pm prove splain libnetcfg piconv enc2xs encguess xsubpp pod2html
-plextractexe = ./c2ph ./corelist ./cpan ./h2ph ./h2xs ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./prove ./splain ./libnetcfg ./piconv ./enc2xs ./encguess ./xsubpp ./pod2html
+pl = corelist.PL cpan.PL h2ph.PL h2xs.PL instmodsh.PL json_pp.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL prove.PL ptar.PL ptardiff.PL ptargrep.PL shasum.PL splain.PL libnetcfg.PL piconv.PL enc2xs.PL encguess.PL xsubpp.PL pod2html.PL zipdetails.PL
+plextract = corelist cpan h2ph h2xs instmodsh json_pp perlbug perldoc perlivp pl2pm prove ptar ptardiff ptargrep shasum splain libnetcfg piconv enc2xs encguess xsubpp pod2html zipdetails
+plextractexe = ./corelist ./cpan ./h2ph ./h2xs ./json_pp ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./prove ./ptar ./ptardiff ./ptargrep ./shasum ./splain ./libnetcfg ./piconv ./enc2xs ./encguess ./xsubpp ./pod2html ./zipdetails
 
 all: $(plextract) 
 
 $(plextract):
 	$(RUN) $(PERL) -I../lib $@.PL
 
-c2ph:		c2ph.PL ../config.sh
-
 cpan:		cpan.PL ../config.sh
 
 corelist:	corelist.PL ../config.sh
@@ -56,6 +54,8 @@ h2xs:		h2xs.PL ../config.sh
 
 instmodsh:	instmodsh.PL ../config.sh
 
+json_pp:	json_pp.PL ../config.sh
+
 perlbug:	perlbug.PL ../config.sh ../patchlevel.h
 
 perldoc:	perldoc.PL ../config.sh
@@ -64,8 +64,16 @@ perlivp:	perlivp.PL ../config.sh
 
 prove:		prove.PL ../config.sh
 
+ptar:		ptar.PL ../config.sh
+
+ptardiff:	ptardiff.PL ../config.sh
+
+ptargrep:	ptargrep.PL ../config.sh
+
 pl2pm:		pl2pm.PL ../config.sh
 
+shasum:		shasum.PL ../config.sh
+
 splain:		splain.PL ../config.sh ../lib/diagnostics.pm
 
 libnetcfg:	libnetcfg.PL ../config.sh
@@ -78,12 +86,14 @@ enc2xs:		encguess.PL ../config.sh
 
 xsubpp:		xsubpp.PL ../config.sh
 
+zipdetails:	zipdetails.PL ../config.sh
+
 pod2html:	pod2html.PL ../config.sh ../ext/Pod-Html/bin/pod2html
 
 clean:
 
 realclean:
-	rm -rf $(plextract) pstruct $(plextractexe)
+	rm -rf $(plextract) $(plextractexe)
 	rm -f ../t/_h2ph_pre.ph
 
 clobber:	realclean
diff --git a/gnu/usr.bin/perl/utils/c2ph.PL b/gnu/usr.bin/perl/utils/c2ph.PL
deleted file mode 100644
index ea87a6f2463..00000000000
--- a/gnu/usr.bin/perl/utils/c2ph.PL
+++ /dev/null
@@ -1,1448 +0,0 @@
-#!/usr/local/bin/perl
-
-use Config;
-use File::Basename qw(&basename &dirname);
-use Cwd;
-use subs qw(link);
-
-sub link { # This is a cut-down version of installperl:link().
-    my($from,$to) = @_;
-    my($success) = 0;
-
-    eval {
-	CORE::link($from, $to)
-	    ? $success++
-	    : ($from =~ m#^/afs/# || $to =~ m#^/afs/#)
-	      ? die "AFS"  # okay inside eval {}
-	      : die "Couldn't link $from to $to: $!\n";
-    };
-    if ($@) {
-	warn $@;
-	require File::Copy;
-	File::Copy::copy($from, $to)
-	    ? $success++
-	    : warn "Couldn't copy $from to $to: $!\n";
-    }
-    $success;
-}
-
-# List explicitly here the variables you want Configure to
-# generate.  Metaconfig only looks for shell variables, so you
-# have to mention them as if they were shell variables, not
-# %Config entries.  Thus you write
-#  $startperl
-# to ensure Configure will look for $Config{startperl}.
-
-# 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: $!";
-
-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.
-
-print OUT <<"!GROK!THIS!";
-$Config{startperl}
-    eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
-	if \$running_under_some_shell;
-!GROK!THIS!
-
-# In the following, perl variables are not expanded during extraction.
-
-print OUT <<'!NO!SUBS!';
-#
-#
-#   c2ph (aka pstruct)
-#   Tom Christiansen, <tchrist@convex.com>
-#
-#   As pstruct, dump C structures as generated from 'cc -g -S' stabs.
-#   As c2ph, do this PLUS generate perl code for getting at the structures.
-#
-#   See the usage message for more.  If this isn't enough, read the code.
-#
-
-=head1 NAME
-
-c2ph, pstruct - Dump C structures as generated from C<cc -g -S> stabs
-
-=head1 SYNOPSIS
-
-    c2ph [-dpnP] [var=val] [files ...]
-
-=head2 OPTIONS
-
-    Options:
-
-    -w	wide; short for: type_width=45 member_width=35 offset_width=8
-    -x	hex; short for:  offset_fmt=x offset_width=08 size_fmt=x       \
-                                                           size_width=04
-
-    -n	do not generate perl code  (default when invoked as pstruct)
-    -p	generate perl code         (default when invoked as c2ph)
-    -v	generate perl code, with C decls as comments
-
-    -i	do NOT recompute sizes for intrinsic datatypes
-    -a	dump information on intrinsics also
-
-    -t	trace execution
-    -d	spew reams of debugging output
-
-    -slist  give comma-separated list a structures to dump
-
-=head1 DESCRIPTION
-
-The following is the old c2ph.doc documentation by Tom Christiansen
-<tchrist@perl.com>
-Date: 25 Jul 91 08:10:21 GMT
-
-Once upon a time, I wrote a program called pstruct.  It was a perl
-program that tried to parse out C structures and display their member
-offsets for you.  This was especially useful for people looking at
-binary dumps or poking around the kernel.
-
-Pstruct was not a pretty program.  Neither was it particularly robust.
-The problem, you see, was that the C compiler was much better at parsing
-C than I could ever hope to be.
-
-So I got smart:  I decided to be lazy and let the C compiler parse the C,
-which would spit out debugger stabs for me to read.  These were much
-easier to parse.  It's still not a pretty program, but at least it's more
-robust.
-
-Pstruct takes any .c or .h files, or preferably .s ones, since that's
-the format it is going to massage them into anyway, and spits out
-listings like this:
-
- struct tty {
-   int                          tty.t_locker                  000      4
-   int                          tty.t_mutex_index             004      4
-   struct tty *                 tty.t_tp_virt                 008      4
-   struct clist                 tty.t_rawq                    00c     20
-     int                        tty.t_rawq.c_cc               00c      4
-     int                        tty.t_rawq.c_cmax             010      4
-     int                        tty.t_rawq.c_cfx              014      4
-     int                        tty.t_rawq.c_clx              018      4
-     struct tty *               tty.t_rawq.c_tp_cpu           01c      4
-     struct tty *               tty.t_rawq.c_tp_iop           020      4
-     unsigned char *            tty.t_rawq.c_buf_cpu          024      4
-     unsigned char *            tty.t_rawq.c_buf_iop          028      4
-   struct clist                 tty.t_canq                    02c     20
-     int                        tty.t_canq.c_cc               02c      4
-     int                        tty.t_canq.c_cmax             030      4
-     int                        tty.t_canq.c_cfx              034      4
-     int                        tty.t_canq.c_clx              038      4
-     struct tty *               tty.t_canq.c_tp_cpu           03c      4
-     struct tty *               tty.t_canq.c_tp_iop           040      4
-     unsigned char *            tty.t_canq.c_buf_cpu          044      4
-     unsigned char *            tty.t_canq.c_buf_iop          048      4
-   struct clist                 tty.t_outq                    04c     20
-     int                        tty.t_outq.c_cc               04c      4
-     int                        tty.t_outq.c_cmax             050      4
-     int                        tty.t_outq.c_cfx              054      4
-     int                        tty.t_outq.c_clx              058      4
-     struct tty *               tty.t_outq.c_tp_cpu           05c      4
-     struct tty *               tty.t_outq.c_tp_iop           060      4
-     unsigned char *            tty.t_outq.c_buf_cpu          064      4
-     unsigned char *            tty.t_outq.c_buf_iop          068      4
-   (*int)()                     tty.t_oproc_cpu               06c      4
-   (*int)()                     tty.t_oproc_iop               070      4
-   (*int)()                     tty.t_stopproc_cpu            074      4
-   (*int)()                     tty.t_stopproc_iop            078      4
-   struct thread *              tty.t_rsel                    07c      4
-
-etc.
-
-
-Actually, this was generated by a particular set of options.  You can control
-the formatting of each column, whether you prefer wide or fat, hex or decimal,
-leading zeroes or whatever.
-
-All you need to be able to use this is a C compiler than generates
-BSD/GCC-style stabs.  The B<-g> option on native BSD compilers and GCC
-should get this for you.
-
-To learn more, just type a bogus option, like B<-\?>, and a long usage message
-will be provided.  There are a fair number of possibilities.
-
-If you're only a C programmer, than this is the end of the message for you.
-You can quit right now, and if you care to, save off the source and run it
-when you feel like it.  Or not.
-
-
-
-But if you're a perl programmer, then for you I have something much more
-wondrous than just a structure offset printer.
-
-You see, if you call pstruct by its other incybernation, c2ph, you have a code
-generator that translates C code into perl code!  Well, structure and union
-declarations at least, but that's quite a bit.
-
-Prior to this point, anyone programming in perl who wanted to interact
-with C programs, like the kernel, was forced to guess the layouts of
-the C structures, and then hardwire these into his program.  Of course,
-when you took your wonderfully crafted program to a system where the
-sgtty structure was laid out differently, your program broke.  Which is
-a shame.
-
-We've had Larry's h2ph translator, which helped, but that only works on
-cpp symbols, not real C, which was also very much needed.  What I offer
-you is a symbolic way of getting at all the C structures.  I've couched
-them in terms of packages and functions.  Consider the following program:
-
-    #!/usr/local/bin/perl
-
-    require 'syscall.ph';
-    require 'sys/time.ph';
-    require 'sys/resource.ph';
-
-    $ru = "\0" x &rusage'sizeof();
-
-    syscall(&SYS_getrusage, &RUSAGE_SELF, $ru)   && die "getrusage: $!";
-
-    @ru = unpack($t = &rusage'typedef(), $ru);
-
-    $utime =  $ru[ &rusage'ru_utime + &timeval'tv_sec  ]
-	   + ($ru[ &rusage'ru_utime + &timeval'tv_usec ]) / 1e6;
-
-    $stime =  $ru[ &rusage'ru_stime + &timeval'tv_sec  ]
-	   + ($ru[ &rusage'ru_stime + &timeval'tv_usec ]) / 1e6;
-
-    printf "you have used %8.3fs+%8.3fu seconds.\n", $utime, $stime;
-
-
-As you see, the name of the package is the name of the structure.  Regular
-fields are just their own names.  Plus the following accessor functions are
-provided for your convenience:
-
- struct      This takes no arguments, and is merely the number of first-
-             level elements in the structure.  You would use this for
-             indexing into arrays of structures, perhaps like this
-
-                 $usec = $u[ &user'u_utimer
-                             + (&ITIMER_VIRTUAL * &itimerval'struct)
-                             + &itimerval'it_value
-                             + &timeval'tv_usec
-                           ];
-
- sizeof      Returns the bytes in the structure, or the member if
-             you pass it an argument, such as
-
-                 &rusage'sizeof(&rusage'ru_utime)
-
- typedef     This is the perl format definition for passing to pack and
-             unpack.  If you ask for the typedef of a nothing, you get
-             the whole structure, otherwise you get that of the member
-             you ask for.  Padding is taken care of, as is the magic to
-             guarantee that a union is unpacked into all its aliases.
-             Bitfields are not quite yet supported however.
-
- offsetof    This function is the byte offset into the array of that
-             member.  You may wish to use this for indexing directly
-             into the packed structure with vec() if you're too lazy
-             to unpack it.
-
- typeof      Not to be confused with the typedef accessor function, this
-             one returns the C type of that field.  This would allow
-             you to print out a nice structured pretty print of some
-             structure without knoning anything about it beforehand.
-             No args to this one is a noop.  Someday I'll post such
-             a thing to dump out your u structure for you.
-
-
-The way I see this being used is like basically this:
-
-        % h2ph <some_include_file.h  >  /usr/lib/perl/tmp.ph
-        % c2ph  some_include_file.h  >> /usr/lib/perl/tmp.ph
-        % install
-
-It's a little tricker with c2ph because you have to get the includes right.
-I can't know this for your system, but it's not usually too terribly difficult.
-
-The code isn't pretty as I mentioned  -- I never thought it would be a 1000-
-line program when I started, or I might not have begun. :-)  But I would have
-been less cavalier in how the parts of the program communicated with each
-other, etc.  It might also have helped if I didn't have to divine the makeup
-of the stabs on the fly, and then account for micro differences between my
-compiler and gcc.
-
-Anyway, here it is.  Should run on perl v4 or greater.  Maybe less.
-
-
- --tom
-
-=cut
-
-$RCSID = '$Id: c2ph,v 1.7 95/10/28 10:41:47 tchrist Exp Locker: tchrist $';
-
-BEGIN { pop @INC if $INC[-1] eq '.' }
-use File::Temp;
-
-######################################################################
-
-# some handy data definitions.   many of these can be reset later.
-
-$bitorder = 'b';  # ascending; set to B for descending bit fields
-
-%intrinsics =
-%template = (
-    'char', 			'c',
-    'unsigned char', 		'C',
-    'short',			's',
-    'short int',		's',
-    'unsigned short',		'S',
-    'unsigned short int',	'S',
-    'short unsigned int',	'S',
-    'int',			'i',
-    'unsigned int',		'I',
-    'long',			'l',
-    'long int',			'l',
-    'unsigned long',		'L',
-    'unsigned long',		'L',
-    'long unsigned int',	'L',
-    'unsigned long int',	'L',
-    'long long',		'q',
-    'long long int',		'q',
-    'unsigned long long',	'Q',
-    'unsigned long long int',	'Q',
-    'float',			'f',
-    'double',			'd',
-    'pointer',			'p',
-    'null',			'x',
-    'neganull',			'X',
-    'bit',			$bitorder,
-);
-
-&buildscrunchlist;
-delete $intrinsics{'neganull'};
-delete $intrinsics{'bit'};
-delete $intrinsics{'null'};
-
-# use -s to recompute sizes
-%sizeof = (
-    'char', 			'1',
-    'unsigned char', 		'1',
-    'short',			'2',
-    'short int',		'2',
-    'unsigned short',		'2',
-    'unsigned short int',	'2',
-    'short unsigned int',	'2',
-    'int',			'4',
-    'unsigned int',		'4',
-    'long',			'4',
-    'long int',			'4',
-    'unsigned long',		'4',
-    'unsigned long int',	'4',
-    'long unsigned int',	'4',
-    'long long',		'8',
-    'long long int',		'8',
-    'unsigned long long',	'8',
-    'unsigned long long int',	'8',
-    'float',			'4',
-    'double',			'8',
-    'pointer',			'4',
-);
-
-($type_width, $member_width, $offset_width, $size_width) = (20, 20, 6, 5);
-
-($offset_fmt, $size_fmt) = ('d', 'd');
-
-$indent = 2;
-
-$CC = 'cc';
-!NO!SUBS!
-
-if (($Config{gccversion} || '') =~ /^(\d+)\.(\d+)/
-  and ($1 > 3 or ($1 == 3 and $2 >= 2))) {
-    print OUT q/$CFLAGS = '-gstabs -S';/;
-} else {
-    print OUT q/$CFLAGS = '-g -S';/;
-}
-
-print OUT <<'!NO!SUBS!';
-
-$DEFINES = '';
-
-$perl++ if $0 =~ m#/?c2ph$#;
-
-use Getopt::Std qw(getopts);
-
-use File::Temp 'tempdir';
-
-eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_]+=)(.*)/ && shift;
-
-getopts('aixdpvtnws:') || &usage(0);
-
-$opt_d && $debug++;
-$opt_t && $trace++;
-$opt_p && $perl++;
-$opt_v && $verbose++;
-$opt_n && ($perl = 0);
-
-if ($opt_w) {
-    ($type_width, $member_width, $offset_width) = (45, 35, 8);
-}
-if ($opt_x) {
-    ($offset_fmt, $offset_width, $size_fmt, $size_width) = ( 'x', '08', 'x', 04 );
-}
-
-eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_]+=)(.*)/ && shift;
-
-sub PLUMBER {
-    select(STDERR);
-    print "oops, apparent pager foulup\n";
-    $isatty++;
-    &usage(1);
-}
-
-sub usage {
-    local($oops) = @_;
-    unless (-t STDOUT) {
-	select(STDERR);
-    } elsif (!$oops) {
-	$isatty++;
-	$| = 1;
-	print "hit <RETURN> for further explanation: ";
-	<STDIN>;
-	open (PIPE, "|". ($ENV{PAGER} || 'more'));
-	$SIG{PIPE} = PLUMBER;
-	select(PIPE);
-    }
-
-    print "usage: $0 [-dpnP] [var=val] [files ...]\n";
-
-    exit unless $isatty;
-
-    print <<EOF;
-
-Options:
-
--w	wide; short for: type_width=45 member_width=35 offset_width=8
--x	hex; short for:  offset_fmt=x offset_width=08 size_fmt=x size_width=04
-
--n  	do not generate perl code  (default when invoked as pstruct)
--p  	generate perl code         (default when invoked as c2ph)
--v	generate perl code, with C decls as comments
-
--i	do NOT recompute sizes for intrinsic datatypes
--a	dump information on intrinsics also
-
--t 	trace execution
--d	spew reams of debugging output
-
--slist  give comma-separated list a structures to dump
-
-
-Var Name        Default Value    Meaning
-
-EOF
-
-    &defvar('CC', 'which_compiler to call');
-    &defvar('CFLAGS', 'how to generate *.s files with stabs');
-    &defvar('DEFINES','any extra cflags or cpp defines, like -I, -D, -U');
-
-    print "\n";
-
-    &defvar('type_width', 'width of type field   (column 1)');
-    &defvar('member_width', 'width of member field (column 2)');
-    &defvar('offset_width', 'width of offset field (column 3)');
-    &defvar('size_width', 'width of size field   (column 4)');
-
-    print "\n";
-
-    &defvar('offset_fmt', 'sprintf format type for offset');
-    &defvar('size_fmt', 'sprintf format type for size');
-
-    print "\n";
-
-    &defvar('indent', 'how far to indent each nesting level');
-
-   print <<'EOF';
-
-    If any *.[ch] files are given, these will be catted together into
-    a temporary *.c file and sent through:
-	    $CC $CFLAGS $DEFINES
-    and the resulting *.s groped for stab information.  If no files are
-    supplied, then stdin is read directly with the assumption that it
-    contains stab information.  All other lines will be ignored.  At
-    most one *.s file should be supplied.
-
-EOF
-    close PIPE;
-    exit 1;
-}
-
-sub defvar {
-    local($var, $msg) = @_;
-    printf "%-16s%-15s  %s\n", $var, eval "\$$var", $msg;
-}
-
-sub safedir {
-    $SAFEDIR = File::Temp::tempdir("c2ph.XXXXXX", TMPDIR => 1, CLEANUP => 1)
-      unless (defined($SAFEDIR));
-}
-
-undef $SAFEDIR;
-
-$recurse = 1;
-
-if (@ARGV) {
-    if (grep(!/\.[csh]$/,@ARGV)) {
-	warn "Only *.[csh] files expected!\n";
-	&usage;
-    }
-    elsif (grep(/\.s$/,@ARGV)) {
-	if (@ARGV > 1) {
-	    warn "Only one *.s file allowed!\n";
-	    &usage;
-	}
-    }
-    elsif (@ARGV == 1 && $ARGV[0] =~ /\.c$/) {
-	local($dir, $file) = $ARGV[0] =~ m#(.*/)?(.*)$#;
-	$chdir = "cd $dir && " if $dir;
-	&system("$chdir$CC $CFLAGS $DEFINES $file") && exit 1;
-	$ARGV[0] =~ s/\.c$/.s/;
-    }
-    else {
-	&safedir;
-	$TMP = "$SAFEDIR/c2ph.$$.c";
-	&system("cat @ARGV > $TMP") && exit 1;
-	&system("cd $SAFEDIR && $CC $CFLAGS $DEFINES $TMP") && exit 1;
-	unlink $TMP;
-	$TMP =~ s/\.c$/.s/;
-	@ARGV = ($TMP);
-    }
-}
-
-if ($opt_s) {
-    for (split(/[\s,]+/, $opt_s)) {
-	$interested{$_}++;
-    }
-}
-
-
-$| = 1 if $debug;
-
-main: {
-
-    if ($trace) {
-	if (-t && !@ARGV) {
-	    print STDERR "reading from your keyboard: ";
-	} else {
-	    print STDERR "reading from " . (@ARGV ? "@ARGV" : "<STDIN>").": ";
-	}
-    }
-
-STAB: while (<>) {
-	if ($trace && !($. % 10)) {
-	    $lineno = $..'';
-	    print STDERR $lineno, "\b" x length($lineno);
-	}
-	next unless /^\s*\.stabs\s+/;
-	$line = $_;
-	s/^\s*\.stabs\s+//;
-	if (s/\\\\"[d,]+$//) {
-	    $saveline .= $line;
-	    $savebar  = $_;
-	    next STAB;
-	}
-	if ($saveline) {
-	    s/^"//;
-	    $_ = $savebar . $_;
-	    $line = $saveline;
-	}
-	&stab;
-	$savebar = $saveline = undef;
-    }
-    print STDERR "$.\n" if $trace;
-    unlink $TMP if $TMP;
-
-    &compute_intrinsics if $perl && !$opt_i;
-
-    print STDERR "resolving types\n" if $trace;
-
-    &resolve_types;
-    &adjust_start_addrs;
-
-    $sum = 2 + $type_width + $member_width;
-    $pmask1 = "%-${type_width}s %-${member_width}s";
-    $pmask2 = "%-${sum}s %${offset_width}${offset_fmt}%s %${size_width}${size_fmt}%s";
-
-
-
-    if ($perl) {
-	# resolve template -- should be in stab define order, but even this isn't enough.
-	print STDERR "\nbuilding type templates: " if $trace;
-	for $i (reverse 0..$#type) {
-	    next unless defined($name = $type[$i]);
-	    next unless defined $struct{$name};
-	    ($iname = $name) =~ s/\..*//;
-	    $build_recursed = 0;
-	    &build_template($name) unless defined $template{&psou($name)} ||
-					$opt_s && !$interested{$iname};
-	}
-	print STDERR "\n\n" if $trace;
-    }
-
-    print STDERR "dumping structs: " if $trace;
-
-    local($iam);
-
-
-
-    foreach $name (sort keys %struct) {
-	($iname = $name) =~ s/\..*//;
-	next if $opt_s && !$interested{$iname};
-	print STDERR "$name " if $trace;
-
-	undef @sizeof;
-	undef @typedef;
-	undef @offsetof;
-	undef @indices;
-	undef @typeof;
-	undef @fieldnames;
-
-	$mname = &munge($name);
-
-	$fname = &psou($name);
-
-	print "# " if $perl && $verbose;
-	$pcode = '';
-	print "$fname {\n" if !$perl || $verbose;
-	$template{$fname} = &scrunch($template{$fname}) if $perl;
-	&pstruct($name,$name,0);
-	print "# " if $perl && $verbose;
-	print "}\n" if !$perl || $verbose;
-	print "\n" if $perl && $verbose;
-
-	if ($perl) {
-	    print "$pcode";
-
-	    printf("\nsub %-32s { %4d; }\n\n", "${mname}'struct", $countof{$name});
-
-	    print <<EOF;
-sub ${mname}'typedef {
-    local(\$${mname}'index) = shift;
-    defined \$${mname}'index
-	? \$${mname}'typedef[\$${mname}'index]
-	: \$${mname}'typedef;
-}
-EOF
-
-	    print <<EOF;
-sub ${mname}'sizeof {
-    local(\$${mname}'index) = shift;
-    defined \$${mname}'index
-	? \$${mname}'sizeof[\$${mname}'index]
-	: \$${mname}'sizeof;
-}
-EOF
-
-	    print <<EOF;
-sub ${mname}'offsetof {
-    local(\$${mname}'index) = shift;
-    defined \$${mname}index
-	? \$${mname}'offsetof[\$${mname}'index]
-	: \$${mname}'sizeof;
-}
-EOF
-
-	    print <<EOF;
-sub ${mname}'typeof {
-    local(\$${mname}'index) = shift;
-    defined \$${mname}index
-	? \$${mname}'typeof[\$${mname}'index]
-	: '$name';
-}
-EOF
-
-	    print <<EOF;
-sub ${mname}'fieldnames {
-    \@${mname}'fieldnames;
-}
-EOF
-
-	$iam = ($isastruct{$name} && 's') || ($isaunion{$name} && 'u');
-
-	    print <<EOF;
-sub ${mname}'isastruct {
-    '$iam';
-}
-EOF
-
-	    print "\$${mname}'typedef = '" . &scrunch($template{$fname})
-		. "';\n";
-
-	    print "\$${mname}'sizeof = $sizeof{$name};\n\n";
-
-
-	    print "\@${mname}'indices = (", &squishseq(@indices), ");\n";
-
-	    print "\n";
-
-	    print "\@${mname}'typedef[\@${mname}'indices] = (",
-			join("\n\t", '', @typedef), "\n    );\n\n";
-	    print "\@${mname}'sizeof[\@${mname}'indices] = (",
-			join("\n\t", '', @sizeof), "\n    );\n\n";
-	    print "\@${mname}'offsetof[\@${mname}'indices] = (",
-			join("\n\t", '', @offsetof), "\n    );\n\n";
-	    print "\@${mname}'typeof[\@${mname}'indices] = (",
-			join("\n\t", '', @typeof), "\n    );\n\n";
-	    print "\@${mname}'fieldnames[\@${mname}'indices] = (",
-			join("\n\t", '', @fieldnames), "\n    );\n\n";
-
-	    $template_printed{$fname}++;
-	    $size_printed{$fname}++;
-	}
-	print "\n";
-    }
-
-    print STDERR "\n" if $trace;
-
-    unless ($perl && $opt_a) {
-	print "\n1;\n" if $perl;
-	exit;
-    }
-
-
-
-    foreach $name (sort bysizevalue keys %intrinsics) {
-	next if $size_printed{$name};
-	print '$',&munge($name),"'sizeof = ", $sizeof{$name}, ";\n";
-    }
-
-    print "\n";
-
-    sub bysizevalue { $sizeof{$a} <=> $sizeof{$b}; }
-
-
-    foreach $name (sort keys %intrinsics) {
-	print '$',&munge($name),"'typedef = '", $template{$name}, "';\n";
-    }
-
-    print "\n1;\n" if $perl;
-
-    exit;
-}
-
-########################################################################################
-
-
-sub stab {
-    next unless $continued || /:[\$\w]+(\(\d+,\d+\))?=[\*\$\w]+/;  # (\d+,\d+) is for sun
-    s/"// 						|| next;
-    s/",([x\d]+),([x\d]+),([x\d]+),.*// 		|| next;
-
-    next if /^\s*$/;
-
-    $size = $3 if $3;
-    $_ = $continued . $_ if length($continued);
-    if (s/\\\\$//) {
-      # if last 2 chars of string are '\\' then stab is continued
-      # in next stab entry
-      chop;
-      $continued = $_;
-      next;
-    }
-    $continued = '';
-
-
-    $line = $_;
-
-    if (($name, $pdecl) = /^([\$ \w]+):[tT]((\d+)(=[rufs*](\d+))+)$/) {
-	print "$name is a typedef for some funky pointers: $pdecl\n" if $debug;
-	&pdecl($pdecl);
-	next;
-    }
-
-
-
-    if (/(([ \w]+):t(\d+|\(\d+,\d+\)))=r?(\d+|\(\d+,\d+\))(;\d+;\d+;)?/) {
-	local($ident) = $2;
-	push(@intrinsics, $ident);
-	$typeno = &typeno($3);
-	$type[$typeno] = $ident;
-	print STDERR "intrinsic $ident in new type $typeno\n" if $debug;
-	next;
-    }
-
-    if (($name, $typeordef, $typeno, $extra, $struct, $_)
-	= /^([\$ \w]+):([ustT])(\d+|\(\d+,\d+\))(=[rufs*](\d+))?(.*)$/)
-    {
-	$typeno = &typeno($typeno);  # sun foolery
-    }
-    elsif (/^[\$\w]+:/) {
-	next; # variable
-    }
-    else {
-	warn "can't grok stab: <$_> in: $line " if $_;
-	next;
-    }
-
-    #warn "got size $size for $name\n";
-    $sizeof{$name} = $size if $size;
-
-    s/;[-\d]*;[-\d]*;$//;  # we don't care about ranges
-
-    $typenos{$name} = $typeno;
-
-    unless (defined $type[$typeno]) {
-	&panic("type 0??") unless $typeno;
-	$type[$typeno] = $name unless defined $type[$typeno];
-	printf "new type $typeno is $name" if $debug;
-	if ($extra =~ /\*/ && defined $type[$struct]) {
-	    print ", a typedef for a pointer to " , $type[$struct] if $debug;
-	}
-    } else {
-	printf "%s is type %d", $name, $typeno if $debug;
-	print ", a typedef for " , $type[$typeno] if $debug;
-    }
-    print "\n" if $debug;
-    #next unless $extra =~ /[su*]/;
-
-    #$type[$struct] = $name;
-
-    if ($extra =~ /[us*]/) {
-	&sou($name, $extra);
-	$_ = &sdecl($name, $_, 0);
-    }
-    elsif (/^=ar/) {
-	print "it's a bare array typedef -- that's pretty sick\n" if $debug;
-	$_ = "$typeno$_";
-	$scripts = '';
-	$_ = &adecl($_,1);
-
-    }
-    elsif (s/((\w+):t(\d+|\(\d+,\d+\)))?=r?(;\d+;\d+;)?//) {  # the ?'s are for gcc
-	push(@intrinsics, $2);
-	$typeno = &typeno($3);
-	$type[$typeno] = $2;
-	print STDERR "intrinsic $2 in new type $typeno\n" if $debug;
-    }
-    elsif (s/^=e//) { # blessed be thy compiler; mine won't do this
-	&edecl;
-    }
-    else {
-	warn "Funny remainder for $name on line $_ left in $line " if $_;
-    }
-}
-
-sub typeno {  # sun thinks types are (0,27) instead of just 27
-    local($_) = @_;
-    s/\(\d+,(\d+)\)/$1/;
-    $_;
-}
-
-sub pstruct {
-    local($what,$prefix,$base) = @_;
-    local($field, $fieldname, $typeno, $count, $offset, $entry);
-    local($fieldtype);
-    local($type, $tname);
-    local($mytype, $mycount, $entry2);
-    local($struct_count) = 0;
-    local($pad, $revpad, $length, $prepad, $lastoffset, $lastlength, $fmt);
-    local($bits,$bytes);
-    local($template);
-
-
-    local($mname) = &munge($name);
-
-    sub munge {
-	local($_) = @_;
-	s/[\s\$\.]/_/g;
-	$_;
-    }
-
-    local($sname) = &psou($what);
-
-    $nesting++;
-
-    for $field (split(/;/, $struct{$what})) {
-	$pad = $prepad = 0;
-	$entry = '';
-	($fieldname, $typeno, $count, $offset, $length) = split(/,/, $field);
-
-	$type = $type[$typeno];
-
-	$type =~ /([^[]*)(\[.*\])?/;
-	$mytype = $1;
-	$count .= $2;
-	$fieldtype = &psou($mytype);
-
-	local($fname) = &psou($name);
-
-	if ($build_templates) {
-
-	    $pad = ($offset - ($lastoffset + $lastlength))/8
-		if defined $lastoffset;
-
-	    if (! $finished_template{$sname}) {
-		if ($isaunion{$what}) {
-		    $template{$sname} .= 'X' x $revpad . ' '    if $revpad;
-		} else {
-		    $template{$sname} .= 'x' x $pad    . ' '    if $pad;
-		}
-	    }
-
-	    $template = &fetch_template($type);
-	    &repeat_template($template,$count);
-
-	    if (! $finished_template{$sname}) {
-		$template{$sname} .= $template;
-	    }
-
-	    $revpad = $length/8 if $isaunion{$what};
-
-	    ($lastoffset, $lastlength) = ($offset, $length);
-
-	} else {
-	    print '# ' if $perl && $verbose;
-	    $entry = sprintf($pmask1,
-			' ' x ($nesting * $indent) . $fieldtype,
-			"$prefix.$fieldname" . $count);
-
-	    $entry =~ s/(\*+)( )/$2$1/;
-
-	    printf $pmask2,
-		    $entry,
-		    ($base+$offset)/8,
-		    ($bits = ($base+$offset)%8) ? ".$bits" : "  ",
-		    $length/8,
-		    ($bits = $length % 8) ? ".$bits": ""
-			if !$perl || $verbose;
-
-	    if ($perl) {
-		$template = &fetch_template($type);
-		&repeat_template($template,$count);
-	    }
-
-	    if ($perl && $nesting == 1) {
-
-		push(@sizeof, int($length/8) .",\t# $fieldname");
-		push(@offsetof, int($offset/8) .",\t# $fieldname");
-		local($little) = &scrunch($template);
-		push(@typedef, "'$little', \t# $fieldname");
-		$type =~ s/(struct|union) //;
-		push(@typeof, "'$mytype" . ($count ? $count : '') .
-		    "',\t# $fieldname");
-		push(@fieldnames, "'$fieldname',");
-	    }
-
-	    print '  ', ' ' x $indent x $nesting, $template
-				if $perl && $verbose;
-
-	    print "\n" if !$perl || $verbose;
-
-	}
-	if ($perl) {
-	    local($mycount) = defined $struct{$mytype} ? $countof{$mytype} : 1;
-	    $mycount *= &scripts2count($count) if $count;
-	    if ($nesting==1 && !$build_templates) {
-		$pcode .= sprintf("sub %-32s { %4d; }\n",
-			"${mname}'${fieldname}", $struct_count);
-		push(@indices, $struct_count);
-	    }
-	    $struct_count += $mycount;
-	}
-
-
-	&pstruct($type, "$prefix.$fieldname", $base+$offset)
-		if $recurse && defined $struct{$type};
-    }
-
-    $countof{$what} = $struct_count unless defined $countof{$whati};
-
-    $template{$sname} .= '$' if $build_templates;
-    $finished_template{$sname}++;
-
-    if ($build_templates && !defined $sizeof{$name}) {
-	local($fmt) = &scrunch($template{$sname});
-	print STDERR "no size for $name, punting with $fmt..." if $debug;
-	eval '$sizeof{$name} = length(pack($fmt, ()))';
-	if ($@) {
-	    chop $@;
-	    warn "couldn't get size for \$name: $@";
-	} else {
-	    print STDERR $sizeof{$name}, "\n" if $debUg;
-	}
-    }
-
-    --$nesting;
-}
-
-
-sub psize {
-    local($me) = @_;
-    local($amstruct) = $struct{$me} ?  'struct ' : '';
-
-    print '$sizeof{\'', $amstruct, $me, '\'} = ';
-    printf "%d;\n", $sizeof{$me};
-}
-
-sub pdecl {
-    local($pdecl) = @_;
-    local(@pdecls);
-    local($tname);
-
-    warn "pdecl: $pdecl\n" if $debug;
-
-    $pdecl =~ s/\(\d+,(\d+)\)/$1/g;
-    $pdecl =~ s/\*//g;
-    @pdecls = split(/=/, $pdecl);
-    $typeno = $pdecls[0];
-    $tname = pop @pdecls;
-
-    if ($tname =~ s/^f//) { $tname = "$tname&"; }
-    #else { $tname = "$tname*"; }
-
-    for (reverse @pdecls) {
-	$tname  .= s/^f// ? "&" : "*";
-	#$tname =~ s/^f(.*)/$1&/;
-	print "type[$_] is $tname\n" if $debug;
-	$type[$_] = $tname unless defined $type[$_];
-    }
-}
-
-
-
-sub adecl {
-    ($arraytype, $unknown, $lower, $upper) = ();
-    #local($typeno);
-    # global $typeno, @type
-    local($_, $typedef) = @_;
-
-    while (s/^((\d+|\(\d+,\d+\))=)?ar(\d+|\(\d+,\d+\));//) {
-	($arraytype, $unknown) = ($2, $3);
-	$arraytype = &typeno($arraytype);
-	$unknown = &typeno($unknown);
-	if (s/^(\d+);(\d+);//) {
-	    ($lower, $upper) = ($1, $2);
-	    $scripts .= '[' .  ($upper+1) . ']';
-	} else {
-	    warn "can't find array bounds: $_";
-	}
-    }
-    if (s/^([(,)\d*f=]*),(\d+),(\d+);//) {
-	($start, $length) = ($2, $3);
-	$whatis = $1;
-	if ($whatis =~ /^(\d+|\(\d+,\d+\))=/) {
-	    $typeno = &typeno($1);
-	    &pdecl($whatis);
-	} else {
-	    $typeno = &typeno($whatis);
-	}
-    } elsif (s/^(\d+)(=[*suf]\d*)//) {
-	local($whatis) = $2;
-
-	if ($whatis =~ /[f*]/) {
-	    &pdecl($whatis);
-	} elsif ($whatis =~ /[su]/) {  #
-	    print "$prefix.$fieldname is an array$scripts anon structs; disgusting\n"
-		if $debug;
-	    #$type[$typeno] = $name unless defined $type[$typeno];
-	    ##printf "new type $typeno is $name" if $debug;
-	    $typeno = $1;
-	    $type[$typeno] = "$prefix.$fieldname";
-	    local($name) = $type[$typeno];
-	    &sou($name, $whatis);
-	    $_ = &sdecl($name, $_, $start+$offset);
-	    1;
-	    $start = $start{$name};
-	    $offset = $sizeof{$name};
-	    $length = $offset;
-	} else {
-	    warn "what's this? $whatis in $line ";
-	}
-    } elsif (/^\d+$/) {
-	$typeno = $_;
-    } else {
-	warn "bad array stab: $_ in $line ";
-	next STAB;
-    }
-    #local($wasdef) = defined($type[$typeno]) && $debug;
-    #if ($typedef) {
-	#print "redefining $type[$typeno] to " if $wasdef;
-	#$type[$typeno] = "$whatis$scripts"; # unless defined $type[$typeno];
-	#print "$type[$typeno]\n" if $wasdef;
-    #} else {
-	#$type[$arraytype] = $type[$typeno] unless defined $type[$arraytype];
-    #}
-    $type[$arraytype] = "$type[$typeno]$scripts" if defined $type[$typeno];
-    print "type[$arraytype] is $type[$arraytype]\n" if $debug;
-    print "$prefix.$fieldname is an array of $type[$arraytype]\n" if $debug;
-    $_;
-}
-
-
-
-sub sdecl {
-    local($prefix, $_, $offset) = @_;
-
-    local($fieldname, $scripts, $type, $arraytype, $unknown,
-    $whatis, $pdecl, $upper,$lower, $start,$length) = ();
-    local($typeno,$sou);
-
-
-SFIELD:
-    while (/^([^;]+);/) {
-	$scripts = '';
-	warn "sdecl $_\n" if $debug;
-	if (s/^([\$\w]+)://) {
-	    $fieldname = $1;
-	} elsif (s/(\d+)=([us])(\d+|\(\d+,\d+\))//) { #
-	    $typeno = &typeno($1);
-	    $type[$typeno] = "$prefix.$fieldname";
-	    local($name) = "$prefix.$fieldname";
-	    &sou($name,$2);
-	    $_ = &sdecl("$prefix.$fieldname", $_, $start+$offset);
-	    $start = $start{$name};
-	    $offset += $sizeof{$name};
-	    #print "done with anon, start is $start, offset is $offset\n";
-	    #next SFIELD;
-	} else  {
-	    warn "weird field $_ of $line" if $debug;
-	    next STAB;
-	    #$fieldname = &gensym;
-	    #$_ = &sdecl("$prefix.$fieldname", $_, $start+$offset);
-	}
-
-	if (/^(\d+|\(\d+,\d+\))=ar/) {
-	    $_ = &adecl($_);
-	}
-	elsif (s/^(\d+|\(\d+,\d+\))?,(\d+),(\d+);//) {
-          ($start, $length) =  ($2, $3);
-          &panic("no length?") unless $length;
-          $typeno = &typeno($1) if $1;
-        }
-        elsif (s/^(\d+)=xs\w+:,(\d+),(\d+);//) {
-	    ($start, $length) =  ($2, $3);
-	    &panic("no length?") unless $length;
-	    $typeno = &typeno($1) if $1;
-	}
-	elsif (s/^((\d+|\(\d+,\d+\))(=[*f](\d+|\(\d+,\d+\)))+),(\d+),(\d+);//) {
-	    ($pdecl, $start, $length) =  ($1,$5,$6);
-	    &pdecl($pdecl);
-	}
-	elsif (s/(\d+)=([us])(\d+|\(\d+,\d+\))//) { # the dratted anon struct
-	    ($typeno, $sou) = ($1, $2);
-	    $typeno = &typeno($typeno);
-	    if (defined($type[$typeno])) {
-		warn "now how did we get type $1 in $fieldname of $line?";
-	    } else {
-		print "anon type $typeno is $prefix.$fieldname\n" if $debug;
-		$type[$typeno] = "$prefix.$fieldname" unless defined $type[$typeno];
-	    };
-	    local($name) = "$prefix.$fieldname";
-	    &sou($name,$sou);
-	    print "anon ".($isastruct{$name}) ? "struct":"union"." for $prefix.$fieldname\n" if $debug;
-	    $type[$typeno] = "$prefix.$fieldname";
-	    $_ = &sdecl("$prefix.$fieldname", $_, $start+$offset);
-	    $start = $start{$name};
-	    $length = $sizeof{$name};
-	}
-	else {
-	    warn "can't grok stab for $name ($_) in line $line ";
-	    next STAB;
-	}
-
-	&panic("no length for $prefix.$fieldname") unless $length;
-	$struct{$name} .= join(',', $fieldname, $typeno, $scripts, $start, $length) . ';';
-    }
-    if (s/;\d*,(\d+),(\d+);//) {
-	local($start, $size) = ($1, $2);
-	$sizeof{$prefix} = $size;
-	print "start of $prefix is $start, size of $sizeof{$prefix}\n" if $debug;
-	$start{$prefix} = $start;
-    }
-    $_;
-}
-
-sub edecl {
-    s/;$//;
-    $enum{$name} = $_;
-    $_ = '';
-}
-
-sub resolve_types {
-    local($sou);
-    for $i (0 .. $#type) {
-	next unless defined $type[$i];
-	$_ = $type[$i];
-	unless (/\d/) {
-	    print "type[$i] $type[$i]\n" if $debug;
-	    next;
-	}
-	print "type[$i] $_ ==> " if $debug;
-	s/^(\d+)(\**)\&\*(\**)/"$2($3".&type($1) . ')()'/e;
-	s/^(\d+)\&/&type($1)/e;
-	s/^(\d+)/&type($1)/e;
-	s/(\*+)([^*]+)(\*+)/$1$3$2/;
-	s/\((\*+)(\w+)(\*+)\)/$3($1$2)/;
-	s/^(\d+)([\*\[].*)/&type($1).$2/e;
-	#s/(\d+)(\*|(\[[\[\]\d\*]+]\])+)/&type($1).$2/ge;
-	$type[$i] = $_;
-	print "$_\n" if $debug;
-    }
-}
-sub type { &psou($type[$_[0]] || "<UNDEFINED>"); }
-
-sub adjust_start_addrs {
-    for (sort keys %start) {
-	($basename = $_) =~ s/\.[^.]+$//;
-	$start{$_} += $start{$basename};
-	print "start: $_ @ $start{$_}\n" if $debug;
-    }
-}
-
-sub sou {
-    local($what, $_) = @_;
-    /u/ && $isaunion{$what}++;
-    /s/ && $isastruct{$what}++;
-}
-
-sub psou {
-    local($what) = @_;
-    local($prefix) = '';
-    if ($isaunion{$what})  {
-	$prefix = 'union ';
-    } elsif ($isastruct{$what})  {
-	$prefix = 'struct ';
-    }
-    $prefix . $what;
-}
-
-sub scrunch {
-    local($_) = @_;
-
-    return '' if $_ eq '';
-
-    study;
-
-    s/\$//g;
-    s/  / /g;
-    1 while s/(\w) \1/$1$1/g;
-
-    # i wanna say this, but perl resists my efforts:
-    #	   s/(\w)(\1+)/$2 . length($1)/ge;
-
-    &quick_scrunch;
-
-    s/ $//;
-
-    $_;
-}
-
-sub buildscrunchlist {
-    $scrunch_code = "sub quick_scrunch {\n";
-    for (values %intrinsics) {
-        $scrunch_code .= "\ts/(${_}{2,})/'$_' . length(\$1)/ge;\n";
-    }
-    $scrunch_code .= "}\n";
-    print "$scrunch_code" if $debug;
-    eval $scrunch_code;
-    &panic("can't eval scrunch_code $@ \nscrunch_code") if $@;
-}
-
-sub fetch_template {
-    local($mytype) = @_;
-    local($fmt);
-    local($count) = 1;
-
-    &panic("why do you care?") unless $perl;
-
-    if ($mytype =~ s/(\[\d+\])+$//) {
-	$count .= $1;
-    }
-
-    if ($mytype =~ /\*/) {
-	$fmt = $template{'pointer'};
-    }
-    elsif (defined $template{$mytype}) {
-	$fmt = $template{$mytype};
-    }
-    elsif (defined $struct{$mytype}) {
-	if (!defined $template{&psou($mytype)}) {
-	    &build_template($mytype) unless $mytype eq $name;
-	}
-	elsif ($template{&psou($mytype)} !~ /\$$/) {
-	    #warn "incomplete template for $mytype\n";
-	}
-	$fmt = $template{&psou($mytype)} || '?';
-    }
-    else {
-	warn "unknown fmt for $mytype\n";
-	$fmt = '?';
-    }
-
-    $fmt x $count . ' ';
-}
-
-sub compute_intrinsics {
-    &safedir;
-    local($TMP) = "$SAFEDIR/c2ph-i.$$.c";
-    open (TMP, ">$TMP") || die "can't open $TMP: $!";
-    select(TMP);
-
-    print STDERR "computing intrinsic sizes: " if $trace;
-
-    undef %intrinsics;
-
-    print <<'EOF';
-main() {
-    char *mask = "%d %s\n";
-EOF
-
-    for $type (@intrinsics) {
-	next if !$type || $type eq 'void' || $type =~ /complex/; # sun stuff
-	print <<"EOF";
-    printf(mask,sizeof($type), "$type");
-EOF
-    }
-
-    print <<'EOF';
-    printf(mask,sizeof(char *), "pointer");
-    exit(0);
-}
-EOF
-    close TMP;
-
-    select(STDOUT);
-    open(PIPE, "cd $SAFEDIR && $CC $TMP && $SAFEDIR/a.out|");
-    while (<PIPE>) {
-	chop;
-	split(' ',$_,2);;
-	print "intrinsic $_[1] is size $_[0]\n" if $debug;
-	$sizeof{$_[1]} = $_[0];
-	$intrinsics{$_[1]} = $template{$_[0]};
-    }
-    close(PIPE) || die "couldn't read intrinsics!";
-    unlink($TMP, "$SAFEDIR/a.out");
-    print STDERR "done\n" if $trace;
-}
-
-sub scripts2count {
-    local($_) = @_;
-
-    s/^\[//;
-    s/\]$//;
-    s/\]\[/*/g;
-    $_ = eval;
-    &panic("$_: $@") if $@;
-    $_;
-}
-
-sub system {
-    print STDERR "@_\n" if $trace;
-    system @_;
-}
-
-sub build_template {
-    local($name) = @_;
-
-    &panic("already got a template for $name") if defined $template{$name};
-
-    local($build_templates) = 1;
-
-    local($lparen) = '(' x $build_recursed;
-    local($rparen) = ')' x $build_recursed;
-
-    print STDERR "$lparen$name$rparen " if $trace;
-    $build_recursed++;
-    &pstruct($name,$name,0);
-    print STDERR "TEMPLATE for $name is ", $template{&psou($name)}, "\n" if $debug;
-    --$build_recursed;
-}
-
-
-sub panic {
-
-    select(STDERR);
-
-    print "\npanic: @_\n";
-
-    exit 1 if $] <= 4.003;  # caller broken
-
-    local($i,$_);
-    local($p,$f,$l,$s,$h,$a,@a,@sub);
-    for ($i = 0; ($p,$f,$l,$s,$h,$w) = caller($i); $i++) {
-	@a = @DB'args;
-	for (@a) {
-	    if (/^StB\000/ && length($_) == length($_main{'_main'})) {
-		$_ = sprintf("%s",$_);
-	    }
-	    else {
-		s/'/\\'/g;
-		s/([^\0]*)/'$1'/ unless /^-?[\d.]+$/;
-		s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg;
-		s/([\0-\37\177])/sprintf("^%c",ord($1)^64)/eg;
-	    }
-	}
-	$w = $w ? '@ = ' : '$ = ';
-	$a = $h ? '(' . join(', ', @a) . ')' : '';
-	push(@sub, "$w&$s$a from file $f line $l\n");
-	last if $signal;
-    }
-    for ($i=0; $i <= $#sub; $i++) {
-	last if $signal;
-	print $sub[$i];
-    }
-    exit 1;
-}
-
-sub squishseq {
-    local($num);
-    local($last) = -1e8;
-    local($string);
-    local($seq) = '..';
-
-    while (defined($num = shift)) {
-        if ($num == ($last + 1)) {
-            $string .= $seq unless $inseq++;
-            $last = $num;
-            next;
-        } elsif ($inseq) {
-            $string .= $last unless $last == -1e8;
-        }
-
-        $string .= ',' if defined $string;
-        $string .= $num;
-        $last = $num;
-        $inseq = 0;
-    }
-    $string .= $last if $inseq && $last != -e18;
-    $string;
-}
-
-sub repeat_template {
-    #  local($template, $scripts) = @_;  have to change caller's values
-
-    if ( $_[1] ) {
-	local($ncount) = &scripts2count($_[1]);
-	if ($_[0] =~ /^\s*c\s*$/i) {
-	    $_[0] = "A$ncount ";
-	    $_[1] = '';
-	} else {
-	    $_[0] = $template x $ncount;
-	}
-    }
-}
-!NO!SUBS!
-
-close OUT or die "Can't close $file: $!";
-chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
-unlink 'pstruct';
-print "Linking $file to pstruct.\n";
-if (defined $Config{d_link}) {
-    link $file, 'pstruct';
-} else {
-  unshift @INC, '../lib';
-  require File::Copy;
-  File::Copy::syscopy('c2ph', 'pstruct');
-}
-exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
-chdir $origdir;
diff --git a/gnu/usr.bin/perl/utils/enc2xs.PL b/gnu/usr.bin/perl/utils/enc2xs.PL
index f50cdd7f6fa..863ff8e9e7a 100644
--- a/gnu/usr.bin/perl/utils/enc2xs.PL
+++ b/gnu/usr.bin/perl/utils/enc2xs.PL
@@ -21,7 +21,7 @@ chdir dirname($0);
 my $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: $!";
 
 print "Extracting $file (with variable substitutions)\n";
 
@@ -38,7 +38,7 @@ use File::Spec;
 
 my $enc2xs = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, "cpan", "Encode", "bin"), "enc2xs");
 
-if (open(ENC2XS, $enc2xs)) {
+if (open(ENC2XS, '<', $enc2xs)) {
     print OUT <ENC2XS>;
     close ENC2XS;
 } else {
diff --git a/gnu/usr.bin/perl/utils/h2ph.PL b/gnu/usr.bin/perl/utils/h2ph.PL
index 6d743718c63..db787499ebe 100644
--- a/gnu/usr.bin/perl/utils/h2ph.PL
+++ b/gnu/usr.bin/perl/utils/h2ph.PL
@@ -19,7 +19,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: $!";
 
 print "Extracting $file (with variable substitutions)\n";
 
@@ -119,8 +119,8 @@ while (defined (my $file = next_file())) {
 	    }
 	}
 
-	open(IN,"$file") || (($Exit = 1),(warn "Can't open $file: $!\n"),next);
-	open(OUT,">$Dest_dir/$outfile") || die "Can't create $outfile: $!\n";
+	open(IN, "<", "$file") || (($Exit = 1),(warn "Can't open $file: $!\n"),next);
+	open(OUT, ">", "$Dest_dir/$outfile") || die "Can't create $outfile: $!\n";
     }
 
     print OUT
@@ -573,7 +573,7 @@ sub next_line
                 $in =~ s/\?\?</{/g;                         # | ??<|  {|
                 $in =~ s/\?\?>/}/g;                         # | ??>|  }|
             }
-	    if ($in =~ s/^\#ifdef __LANGUAGE_PASCAL__//) {
+	    if ($in =~ /^\#ifdef __LANGUAGE_PASCAL__/) {
 		# Tru64 disassembler.h evilness: mixed C and Pascal.
 		while (<IN>) {
 		    last if /^\#endif/;
@@ -581,8 +581,8 @@ sub next_line
 		$in = "";
 		next READ;
 	    }
-	    # Skip inlined functions in headers
-	    if ($in =~ s/^(extern|static) (__inline__|inline) .*[^;]\s*$//) {
+	    if ($in =~ /^extern inline / && # Inlined assembler.
+		$^O eq 'linux' && $file =~ m!(?:^|/)asm/[^/]+\.h$!) {
 		while (<IN>) {
 		    last if /^}/;
 		}
@@ -737,7 +737,7 @@ sub queue_includes_from
 
     return if ($file eq "-");
 
-    open HEADER, $file or return;
+    open HEADER, "<", $file or return;
         while (defined($line = <HEADER>)) {
             while (/\\$/) { # Handle continuation lines
                 chop $line;
@@ -777,7 +777,7 @@ sub build_preamble_if_necessary
     # Can we skip building the preamble file?
     if (-r $preamble) {
         # Extract version number from first line of preamble:
-        open  PREAMBLE, $preamble or die "Cannot open $preamble:  $!";
+        open  PREAMBLE, "<", $preamble or die "Cannot open $preamble:  $!";
             my $line = <PREAMBLE>;
             $line =~ /(\b\d+\b)/;
         close PREAMBLE            or die "Cannot close $preamble:  $!";
@@ -788,7 +788,7 @@ sub build_preamble_if_necessary
 
     my (%define) = _extract_cc_defines();
 
-    open  PREAMBLE, ">$preamble" or die "Cannot open $preamble:  $!";
+    open  PREAMBLE, ">", $preamble or die "Cannot open $preamble:  $!";
 	print PREAMBLE "# This file was created by h2ph version $VERSION\n";
         # Prevent non-portable hex constants from warning.
         #
diff --git a/gnu/usr.bin/perl/utils/h2xs.PL b/gnu/usr.bin/perl/utils/h2xs.PL
index 8fda87b0a78..92dce0d346a 100644
--- a/gnu/usr.bin/perl/utils/h2xs.PL
+++ b/gnu/usr.bin/perl/utils/h2xs.PL
@@ -18,7 +18,7 @@ chdir dirname($0);
 my $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: $!";
 
 print "Extracting $file (with variable substitutions)\n";
 
@@ -842,7 +842,7 @@ if( @path_h ){
       # Scan the header file (we should deal with nested header files)
       # Record the names of simple #define constants into const_names
             # Function prototypes are processed below.
-      open(CH, "<$rel_path_h") || die "Can't open $rel_path_h: $!\n";
+      open(CH, "<", "$rel_path_h") || die "Can't open $rel_path_h: $!\n";
     defines:
       while (<CH>) {
 	if ($pre_sub_tri_graphs) {
@@ -975,7 +975,7 @@ if( ! $opt_X ){  # use XS, unless it was disabled
     Devel::PPPort::WriteFile('ppport.h')
         || die "Can't create $ext$modpname/ppport.h: $!\n";
   }
-  open(XS, ">$modfname.xs") || die "Can't create $ext$modpname/$modfname.xs: $!\n";
+  open(XS, ">", "$modfname.xs") || die "Can't create $ext$modpname/$modfname.xs: $!\n";
   if ($opt_x) {
     warn "Scanning typemaps...\n";
     get_typemap();
@@ -1034,7 +1034,7 @@ if( ! $opt_X ){  # use XS, unless it was disabled
       }
     }
     { local $" = '|';
-      $typedef_rex = qr(\b(?<!struct )(?:@good_td)\b) if @good_td;
+      $typedef_rex = qr(\b(?<!struct )(?<!enum )(?:@good_td)\b) if @good_td;
     }
     %known_fnames = map @$_[1,3], @$fdecls_parsed; # [1,3] is NAME, FULLTEXT
     if ($fmask) {
@@ -1093,7 +1093,7 @@ for (sort(keys(%const_names))) {
 }
 
 -d $modpmdir || mkpath([$modpmdir], 0, 0775);
-open(PM, ">$modpmname") || die "Can't create $ext$modpname/$modpmname: $!\n";
+open(PM, ">", "$modpmname") || die "Can't create $ext$modpname/$modpmname: $!\n";
 
 $" = "\n\t";
 warn "Writing $ext$modpname/$modpmname\n";
@@ -1779,7 +1779,7 @@ sub get_typemap {
     warn " Scanning $typemap\n";
     warn("Warning: ignoring non-text typemap file '$typemap'\n"), next
       unless -T $typemap ;
-    open(TYPEMAP, $typemap)
+    open(TYPEMAP, "<", $typemap)
       or warn ("Warning: could not open typemap file '$typemap': $!\n"), next;
     my $mode = 'Typemap';
     while (<TYPEMAP>) {
@@ -1872,7 +1872,7 @@ close XS;
 if (%types_seen) {
   my $type;
   warn "Writing $ext$modpname/typemap\n";
-  open TM, ">typemap" or die "Cannot open typemap file for write: $!";
+  open TM, ">", "typemap" or die "Cannot open typemap file for write: $!";
 
   for $type (sort keys %types_seen) {
     my $entry = assign_typemap_entry $type;
@@ -1906,7 +1906,7 @@ EOP
 } # if( ! $opt_X )
 
 warn "Writing $ext$modpname/Makefile.PL\n";
-open(PL, ">Makefile.PL") || die "Can't create $ext$modpname/Makefile.PL: $!\n";
+open(PL, ">", "Makefile.PL") || die "Can't create $ext$modpname/Makefile.PL: $!\n";
 
 my $prereq_pm = '';
 
@@ -2032,7 +2032,7 @@ close(PL) || die "Can't close $ext$modpname/Makefile.PL: $!\n";
 # Create a simple README since this is a CPAN requirement
 # and it doesn't hurt to have one
 warn "Writing $ext$modpname/README\n";
-open(RM, ">README") || die "Can't create $ext$modpname/README:$!\n";
+open(RM, ">", "README") || die "Can't create $ext$modpname/README:$!\n";
 my $thisyear = (gmtime)[5] + 1900;
 my $rmhead = "$modpname version $TEMPLATE_VERSION";
 my $rmheadeq = "=" x length($rmhead);
@@ -2099,7 +2099,7 @@ unless (-d "$testdir") {
 warn "Writing $ext$modpname/$testfile\n";
 my $tests = @const_names ? 2 : 1;
 
-open EX, ">$testfile" or die "Can't create $ext$modpname/$testfile: $!\n";
+open EX, ">", "$testfile" or die "Can't create $ext$modpname/$testfile: $!\n";
 
 print EX <<_END_;
 # Before 'make install' is performed this script should be runnable with
@@ -2205,7 +2205,7 @@ close(EX) || die "Can't close $ext$modpname/$testfile: $!\n";
 unless ($opt_C) {
   warn "Writing $ext$modpname/Changes\n";
   $" = ' ';
-  open(EX, ">Changes") || die "Can't create $ext$modpname/Changes: $!\n";
+  open(EX, ">", "Changes") || die "Can't create $ext$modpname/Changes: $!\n";
   @ARGS = map {/[\s\"\'\`\$*?^|&<>\[\]\{\}\(\)]/ ? "'$_'" : $_} @ARGS;
   print EX <<EOP;
 Revision history for Perl extension $module.
@@ -2219,7 +2219,7 @@ EOP
 }
 
 warn "Writing $ext$modpname/MANIFEST\n";
-open(MANI,'>MANIFEST') or die "Can't create MANIFEST: $!";
+open(MANI, '>', 'MANIFEST') or die "Can't create MANIFEST: $!";
 my @files = grep { -f } (<*>, <t/*>, <$fallbackdirname/*>, <$modpmdir/*>);
 if (!@files) {
   eval {opendir(D,'.');};
diff --git a/gnu/usr.bin/perl/utils/libnetcfg.PL b/gnu/usr.bin/perl/utils/libnetcfg.PL
index 26d2f995a90..e1e9ee270f3 100644
--- a/gnu/usr.bin/perl/utils/libnetcfg.PL
+++ b/gnu/usr.bin/perl/utils/libnetcfg.PL
@@ -18,7 +18,7 @@ chdir dirname($0);
 my $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: $!";
 
 print "Extracting $file (with variable substitutions)\n";
 
@@ -343,7 +343,7 @@ my %oldcfg = ();
 $Net::Config::CONFIGURE = 1; # Suppress load of user overrides
 if( -f $libnet_cfg_in )
  {
-  %oldcfg = ( %{ do $libnet_cfg_in } );
+  %oldcfg = ( %{ local @INC = '.'; do $libnet_cfg_in } );
  }
 elsif (eval { require Net::Config }) 
  {
diff --git a/gnu/usr.bin/perl/utils/perlbug.PL b/gnu/usr.bin/perl/utils/perlbug.PL
index 931fcd86851..d1eb1e04a87 100644
--- a/gnu/usr.bin/perl/utils/perlbug.PL
+++ b/gnu/usr.bin/perl/utils/perlbug.PL
@@ -20,7 +20,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: $!";
 
 # get patchlevel.h timestamp
 
@@ -65,6 +65,8 @@ use File::Spec;		# keep perlbug Perl 5.005 compatible
 use Getopt::Std;
 use File::Basename 'basename';
 
+$Getopt::Std::STANDARD_HELP_VERSION = 1;
+
 sub paraprint;
 
 BEGIN {
@@ -77,9 +79,11 @@ BEGIN {
     $::HaveTemp = ($@ eq "");
     eval { require Module::CoreList; };
     $::HaveCoreList = ($@ eq "");
+    eval { require Text::Wrap; };
+    $::HaveWrap = ($@ eq "");
 };
 
-my $Version = "1.40";
+our $VERSION = "1.41";
 
 #TODO:
 #       make sure failure (transmission-wise) of Mail::Send is accounted for.
@@ -94,6 +98,8 @@ my( $file, $usefile, $cc, $address, $bugaddress, $testaddress, $thanksaddress,
     %opt, $have_attachment, $attachments, $has_patch, $mime_boundary
 );
 
+my $running_noninteractively = !-t STDIN;
+
 my $perl_version = $^V ? sprintf("%vd", $^V) : $];
 
 my $config_tag2 = "$perl_version - $Config{cf_time}";
@@ -102,7 +108,7 @@ Init();
 
 if ($opt{h}) { Help(); exit; }
 if ($opt{d}) { Dump(*STDOUT); exit; }
-if (!-t STDIN && !($ok and not $opt{n})) {
+if ($running_noninteractively && !$opt{t} && !($ok and not $opt{n})) {
     paraprint <<"EOF";
 Please use $progname interactively. If you want to
 include a file, you can use the -f switch.
@@ -181,6 +187,9 @@ EOF
     lc $alt;
 }
 
+sub HELP_MESSAGE { Help(); exit; }
+sub VERSION_MESSAGE { print "perlbug version $VERSION\n"; }
+
 sub Init {
     # -------- Setup --------
 
@@ -189,13 +198,6 @@ sub Init {
     $Is_Linux = lc($^O) eq 'linux';
     $Is_OpenBSD = lc($^O) eq 'openbsd';
 
-    if (!getopts("Adhva:s:b:f:F:r:e:SCc:to:n:T:p:", \%opt)) { Help(); exit; };
-
-    # This comment is needed to notify metaconfig that we are
-    # using the $perladmin, $cf_by, and $cf_time definitions.
-
-    # -------- Configuration ---------
-
     # perlbug address
     $bugaddress = 'perlbug@perl.org';
 
@@ -205,6 +207,16 @@ sub Init {
     # Thanks address
     $thanksaddress = 'perl-thanks@perl.org';
 
+    # Defaults if getopts fails.
+    $address = (basename ($0) =~ /^perlthanks/i) ? $thanksaddress : $bugaddress;
+    $cc = $::Config{'perladmin'} || $::Config{'cf_email'} || $::Config{'cf_by'} || '';
+
+    HELP_MESSAGE() unless getopts("Adhva:s:b:f:F:r:e:SCc:to:n:T:p:", \%opt);
+
+    # This comment is needed to notify metaconfig that we are
+    # using the $perladmin, $cf_by, and $cf_time definitions.
+    # -------- Configuration ---------
+
     if (basename ($0) =~ /^perlthanks/i) {
 	# invoked as perlthanks
 	$opt{T} = 1;
@@ -237,7 +249,7 @@ sub Init {
 
     # We have one or more attachments
     $have_attachment = ($opt{p} || 0);
-    $mime_boundary = ('-' x 12) . "$Version.perlbug" if $have_attachment;
+    $mime_boundary = ('-' x 12) . "$VERSION.perlbug" if $have_attachment;
 
     # Comma-separated list of attachments
     $attachments = $opt{p} || "";
@@ -346,14 +358,15 @@ sub Query {
 This program provides an easy way to send a thank-you message back to the
 authors and maintainers of perl.
 
-If you wish to submit a bug report, please run it without the -T flag.
+If you wish to submit a bug report, please run it without the -T flag
+(or run the program perlbug rather than perlthanks)
 EOF
 	} else {
 	    paraprint <<"EOF";
 This program provides an easy way to create a message reporting a
 bug in the core perl distribution (along with tests or patches)
 to the volunteers who maintain perl at $address.  To send a thank-you
-note to $thanksaddress instead of a bug report, please use the -T flag.
+note to $thanksaddress instead of a bug report, please run 'perlthanks'.
 
 Please do not use $0 to send test messages, test whether perl
 works, or to report bugs in perl modules from CPAN.
@@ -607,7 +620,7 @@ EOF
 
     print REP <<EOF;
 This is a $reptype report for perl from $from,
-generated with the help of perlbug $Version running under perl $perl_version.
+generated with the help of perlbug $VERSION running under perl $perl_version.
 
 EOF
 
@@ -751,7 +764,7 @@ sub Edit {
 	$ed = $entry unless $entry eq '';
     }
 
-    _edit_file($ed);
+    _edit_file($ed) unless $running_noninteractively;
 }
 
 sub _edit_file {
@@ -828,16 +841,14 @@ a few options. You can:
 EOF
       retry:
         print $menu;
-	    my $action =  _prompt('', "Action (Send/Display/Edit/Subject/Save to File)");;
+	    my $action =  _prompt('', "Action (Send/Display/Edit/Subject/Save to File)",
+	        $opt{t} ? 'q' : '');
         print "\n";
 	    if ($action =~ /^(f|sa)/i) { # <F>ile/<Sa>ve
             if ( SaveMessage() ) { exit }
 	    } elsif ($action =~ /^(d|l|sh)/i ) { # <D>isplay, <L>ist, <Sh>ow
 		# Display the message
-		open(REP, '<:raw', $filename) or die "Couldn't open file '$filename': $!\n";
-		binmode(REP, ':raw :crlf') if $Is_MSWin32;
-		while (<REP>) { print $_ }
-		close(REP) or die "Error closing report file '$filename': $!";
+		print _read_report($filename);
 		if ($have_attachment) {
 		    print "\n\n---\nAttachment(s):\n";
 		    for my $att (split /\s*,\s*/, $attachments) { print "    $att\n"; }
@@ -879,7 +890,7 @@ sub TrivialSubject {
     if ($subject =~
 	/^(y(es)?|no?|help|perl( (bug|problem))?|bug|problem)$/i ||
 	length($subject) < 4 ||
-	$subject !~ /\s/) {
+	($subject !~ /\s/ && ! $opt{t})) { # non-whitespace is accepted in test mode
 	print "\nThe subject you entered wasn't very descriptive. Please try again.\n\n";
         return 1;
     } else {
@@ -1014,6 +1025,7 @@ sub _prompt {
     }
     print $prompt. ($default ? " [$default]" :''). ": ";
 	my $result = scalar(<>);
+    return $default if !defined $result; # got eof
     chomp($result);
 	$result =~ s/^\s*(.*?)\s*$/$1/s;
     if ($default && $result eq '') {
@@ -1080,13 +1092,29 @@ ATTACHMENT
     return $attach;
 }
 
+sub _read_report {
+    my $fname = shift;
+    my $content;
+    open( REP, "<:raw", $fname ) or die "Couldn't open file '$fname': $!\n";
+    binmode(REP, ':raw :crlf') if $Is_MSWin32;
+    # wrap long lines to make sure the report gets delivered
+    local $Text::Wrap::columns = 900;
+    local $Text::Wrap::huge = 'overflow';
+    while (<REP>) {
+        if ($::HaveWrap && /\S/) { # wrap() would remove empty lines
+            $content .= Text::Wrap::wrap(undef, undef, $_);
+        } else {
+            $content .= $_;
+        }
+    }
+    close(REP) or die "Error closing report file '$fname': $!";
+    return $content;
+}
+
 sub build_complete_message {
     my $content = _build_header(%{_message_headers()}) . "\n\n";
     $content .= _add_body_start() if $have_attachment;
-    open( REP, "<:raw", $filename ) or die "Couldn't open file '$filename': $!\n";
-    binmode(REP, ':raw :crlf') if $Is_MSWin32;
-    while (<REP>) { $content .= $_; }
-    close(REP) or die "Error closing report file '$filename': $!";
+    $content .= _read_report($filename);
     $content .= _add_attachments() if $have_attachment;
     return $content;
 }
@@ -1094,6 +1122,10 @@ sub build_complete_message {
 sub save_message_to_disk {
     my $file = shift;
 
+        if (-e $file) {
+            my $response = _prompt( '', "Overwrite existing '$file'", 'n' );
+            return undef unless $response =~ / yes | y /xi;
+        }
         open OUTFILE, '>:raw', $file or do { warn  "Couldn't open '$file': $!\n"; return undef};
         binmode(OUTFILE, ':raw :crlf') if $Is_MSWin32;
 
@@ -1137,10 +1169,7 @@ sub _send_message_mailsend {
     $fh = $msg->open;
     binmode($fh, ':raw');
     print $fh _add_body_start() if $have_attachment;
-    open(REP, "<:raw", $filename) or die "Couldn't open '$filename': $!\n";
-    binmode(REP, ':raw :crlf') if $Is_MSWin32;
-    while (<REP>) { print $fh $_ }
-    close(REP) or die "Error closing $filename: $!";
+    print $fh _read_report($filename);
     print $fh _add_attachments() if $have_attachment;
     $fh->close or die "Error sending mail: $!";
 
@@ -1244,6 +1273,8 @@ S<[ B<-S> ]> S<[ B<-t> ]>  S<[ B<-d> ]>  S<[ B<-A> ]>  S<[ B<-h> ]> S<[ B<-T> ]>
 B<perlbug> S<[ B<-v> ]> S<[ B<-r> I<returnaddress> ]>
  S<[ B<-A> ]> S<[ B<-ok> | B<-okay> | B<-nok> | B<-nokay> ]>
 
+B<perlthanks>
+
 =head1 DESCRIPTION
 
 
@@ -1396,8 +1427,8 @@ description of what's wrong is fine.
 
 =item Can you use C<perlbug> to submit a thank-you note?
 
-Yes, you can do this by using the C<-T> option.
-Thank-you notes are good. It makes people
+Yes, you can do this by either using the C<-T> option, or by invoking
+the program as C<perlthanks>. Thank-you notes are good. It makes people
 smile. 
 
 =back
@@ -1524,6 +1555,8 @@ supply one on the command line.
 =item B<-t>
 
 Test mode.  The target address defaults to B<perlbug-test@perl.org>.
+Also makes it possible to command perlbug from a pipe or file, for
+testing purposes.
 
 =item B<-T>
 
diff --git a/gnu/usr.bin/perl/utils/perldoc.PL b/gnu/usr.bin/perl/utils/perldoc.PL
index cd60bd4354c..afaa5a9a3f1 100644
--- a/gnu/usr.bin/perl/utils/perldoc.PL
+++ b/gnu/usr.bin/perl/utils/perldoc.PL
@@ -29,7 +29,7 @@ warn "How odd, I'm going to generate $file_shortname?!"
 
 $file .= '.com' if $^O eq 'VMS';
 
-open OUT,">$file" or die "Can't create $file: $!";
+open OUT, ">", $file or die "Can't create $file: $!";
 
 print "Extracting \"$file\" (with variable substitutions)\n";
 
diff --git a/gnu/usr.bin/perl/utils/perlivp.PL b/gnu/usr.bin/perl/utils/perlivp.PL
index e5229133f45..50d187a544e 100644
--- a/gnu/usr.bin/perl/utils/perlivp.PL
+++ b/gnu/usr.bin/perl/utils/perlivp.PL
@@ -20,7 +20,7 @@ my $file = basename($0, '.PL');
 $file .= '.com' if $^O eq 'VMS';
 
 # Create output file.
-open OUT,">$file" or die "Can't create $file: $!";
+open OUT, ">", $file or die "Can't create $file: $!";
 
 print "Extracting $file (with variable substitutions)\n";
 
@@ -231,7 +231,7 @@ if (defined($Config{'extensions'})) {
         next if $_ eq 'XS/APItest';
         next if $_ eq 'XS/Typemap';
            # VMS$ perl  -e "eval ""require \""Devel/DProf.pm\"";"" print $@"
-           # \NT> perl  -e "eval \"require 'Devel/DProf.pm'\"; print $@"
+           # \NT> perl  -e "eval \"require './Devel/DProf.pm'\"; print $@"
            # DProf: run perl with -d to use DProf.
            # Compilation failed in require at (eval 1) line 1.
         eval " require \"$_.pm\"; ";
diff --git a/gnu/usr.bin/perl/utils/pl2pm.PL b/gnu/usr.bin/perl/utils/pl2pm.PL
index b7e1cea30d6..19aef581aba 100644
--- a/gnu/usr.bin/perl/utils/pl2pm.PL
+++ b/gnu/usr.bin/perl/utils/pl2pm.PL
@@ -18,7 +18,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: $!";
 
 print "Extracting $file (with variable substitutions)\n";
 
@@ -126,7 +126,7 @@ while (<>) {
 	$export_ok = "\@EXPORT_OK = qw(@export_ok);\n";
     }
 
-    if ( open(PM, ">$newname") ) {
+    if ( open(PM, ">", $newname) ) {
         print PM <<"END";
 package $newpack;
 use 5.006;
diff --git a/gnu/usr.bin/perl/utils/splain.PL b/gnu/usr.bin/perl/utils/splain.PL
index bbcdad6f1e9..ccf325de930 100644
--- a/gnu/usr.bin/perl/utils/splain.PL
+++ b/gnu/usr.bin/perl/utils/splain.PL
@@ -21,11 +21,11 @@ $file = basename($0, '.PL');
 $file .= '.com' if $^O eq 'VMS';
 
 # Open input file before creating output file.
-$IN = File::Spec->catfile(File::Spec->updir, 'lib', 'diagnostics.pm');
-open IN or die "Can't open $IN: $!\n";
+$in = File::Spec->catfile(File::Spec->updir, 'lib', 'diagnostics.pm');
+open IN, '<', $in or die "Can't open $in: $!\n";
 
 # Create output file.
-open OUT,">$file" or die "Can't create $file: $!";
+open OUT, '>', $file or die "Can't create $file: $!";
 
 print "Extracting $file (with variable substitutions)\n";