Remove trailing whitespace.

58 files changed, 503 insertions, 345 deletions

diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile
index 661af5f66367..385033aed708 100644
--- a/gnu/usr.bin/perl/Makefile
+++ b/gnu/usr.bin/perl/Makefile
@@ -4,7 +4,7 @@
 # Note: I'm not sure what to do with c2ph located in misc...
 #
 
-SUBDIR= perl tperl sperl usub lib x2p  
+SUBDIR= perl tperl sperl usub lib x2p
 
 .include <bsd.subdir.mk>
 
diff --git a/gnu/usr.bin/perl/lib/Makefile b/gnu/usr.bin/perl/lib/Makefile
index 88bc2abdc4aa..387824ba0708 100644
--- a/gnu/usr.bin/perl/lib/Makefile
+++ b/gnu/usr.bin/perl/lib/Makefile
@@ -4,7 +4,7 @@ PLIB+= abbrev.pl assert.pl bigfloat.pl bigint.pl bigrat.pl cacheout.pl
 PLIB+= chat2.pl complete.pl ctime.pl dumpvar.pl exceptions.pl fastcwd.pl
 PLIB+= find.pl finddepth.pl flush.pl getcwd.pl getopts.pl importenv.pl
 PLIB+= look.pl newgetopt.pl open2.pl perldb.pl pwd.pl shellwords.pl
-PLIB+= stat.pl syslog.pl termcap.pl timelocal.pl validate.pl 
+PLIB+= stat.pl syslog.pl termcap.pl timelocal.pl validate.pl
 
 NOOBJ=
 
diff --git a/gnu/usr.bin/perl/perl/EXTERN.h b/gnu/usr.bin/perl/perl/EXTERN.h
index 181d50dd739e..fec95bf60906 100644
--- a/gnu/usr.bin/perl/perl/EXTERN.h
+++ b/gnu/usr.bin/perl/perl/EXTERN.h
@@ -1,4 +1,4 @@
-/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:33 $
+/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: EXTERN.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:33  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  10:10:32  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  00:58:26  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #undef EXT
diff --git a/gnu/usr.bin/perl/perl/INTERN.h b/gnu/usr.bin/perl/perl/INTERN.h
index 21c90265a04b..d1792d852ea3 100644
--- a/gnu/usr.bin/perl/perl/INTERN.h
+++ b/gnu/usr.bin/perl/perl/INTERN.h
@@ -1,4 +1,4 @@
-/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:33 $
+/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: INTERN.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:33  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  10:10:42  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  00:58:35  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #undef EXT
diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile
index 3468e2209b87..c981ac18b559 100644
--- a/gnu/usr.bin/perl/perl/Makefile
+++ b/gnu/usr.bin/perl/perl/Makefile
@@ -1,17 +1,17 @@
 #
-# 
+#
 
 PROG= perl
 
 SRCS+= array.c cmd.c cons.c consarg.c doarg.c doio.c dolist.c dump.c
 SRCS+= eval.c form.c hash.c malloc.c perl.c perly.c regcomp.c regexec.c
 SRCS+= stab.c str.c toke.c util.c usersub.c
-CFLAGS+= -I${.CURDIR} 
-LDADD= -lm 
-DPADD= ${LIBM} 
+CFLAGS+= -I${.CURDIR}
+LDADD= -lm
+DPADD= ${LIBM}
 
 DPADD+= ${LIBCRYPT}
 LDADD+= -lcrypt
 
 .include "../../Makefile.inc"
-.include <bsd.prog.mk> 
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/perl/arg.h b/gnu/usr.bin/perl/perl/arg.h
index 813ce3adc942..b3f8d5a050cc 100644
--- a/gnu/usr.bin/perl/perl/arg.h
+++ b/gnu/usr.bin/perl/perl/arg.h
@@ -1,4 +1,4 @@
-/* $RCSfile: arg.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
+/* $RCSfile: arg.h,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:24 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,10 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: arg.h,v $
+ * Revision 1.2  1994/09/11  03:17:24  gclarkii
+ * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h
+ * Added casts to shutup warnings in doio.c
+ *
  * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
  * Initial import of Perl 4.046 bmaked
  *
@@ -15,19 +19,19 @@
  * Revision 4.0.1.3  92/06/08  11:44:06  lwall
  * patch20: O_PIPE conflicted with Atari
  * patch20: clarified debugging output for literals and double-quoted strings
- * 
+ *
  * Revision 4.0.1.2  91/11/05  15:51:05  lwall
  * patch11: added eval {}
  * patch11: added sort {} LIST
- * 
+ *
  * Revision 4.0.1.1  91/06/07  10:18:30  lwall
  * patch4: length($`), length($&), length($') now optimized to avoid string copy
  * patch4: new copyright notice
  * patch4: many, many itty-bitty portability fixes
- * 
+ *
  * Revision 4.0  91/03/20  01:03:09  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #define O_NULL 0
diff --git a/gnu/usr.bin/perl/perl/array.c b/gnu/usr.bin/perl/perl/array.c
index 445bc60be7dc..a413e3b2a670 100644
--- a/gnu/usr.bin/perl/perl/array.c
+++ b/gnu/usr.bin/perl/perl/array.c
@@ -1,4 +1,4 @@
-/* $RCSfile: array.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:34 $
+/* $RCSfile: array.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:31 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,22 +6,25 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: array.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:31  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:34  nate
  * PERL!
  *
  * Revision 4.0.1.3  92/06/08  11:45:05  lwall
  * patch20: Perl now distinguishes overlapped copies from non-overlapped
- * 
+ *
  * Revision 4.0.1.2  91/11/05  16:00:14  lwall
  * patch11: random cleanup
  * patch11: passing non-existend array elements to subrouting caused core dump
- * 
+ *
  * Revision 4.0.1.1  91/06/07  10:19:08  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:03:32  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
diff --git a/gnu/usr.bin/perl/perl/array.h b/gnu/usr.bin/perl/perl/array.h
index 93d4920aedcf..9b2207be765c 100644
--- a/gnu/usr.bin/perl/perl/array.h
+++ b/gnu/usr.bin/perl/perl/array.h
@@ -1,4 +1,4 @@
-/* $RCSfile: array.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:34 $
+/* $RCSfile: array.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,18 +6,21 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: array.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:34  nate
  * PERL!
  *
  * Revision 4.0.1.2  92/06/08  11:45:57  lwall
  * patch20: removed implicit int declarations on funcions
- * 
+ *
  * Revision 4.0.1.1  91/06/07  10:19:20  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:03:44  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 struct atbl {
diff --git a/gnu/usr.bin/perl/perl/cmd.c b/gnu/usr.bin/perl/perl/cmd.c
index 1ddbde082a1e..162926d0a316 100644
--- a/gnu/usr.bin/perl/perl/cmd.c
+++ b/gnu/usr.bin/perl/perl/cmd.c
@@ -1,4 +1,4 @@
-/* $RCSfile: cmd.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:35 $
+/* $RCSfile: cmd.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,32 +6,35 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: cmd.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:32  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:35  nate
  * PERL!
  *
  * Revision 4.0.1.5  92/06/08  12:00:39  lwall
  * patch20: the switch optimizer didn't do anything in subroutines
  * patch20: removed implicit int declarations on funcions
- * 
+ *
  * Revision 4.0.1.4  91/11/11  16:29:33  lwall
  * patch19: do {$foo ne "bar";} returned wrong value
  * patch19: some earlier patches weren't propagated to alternate 286 code
- * 
+ *
  * Revision 4.0.1.3  91/11/05  16:07:43  lwall
  * patch11: random cleanup
  * patch11: "foo\0" eq "foo" was sometimes optimized to true
  * patch11: foreach on null list could spring memory leak
- * 
+ *
  * Revision 4.0.1.2  91/06/07  10:26:45  lwall
  * patch4: new copyright notice
  * patch4: made some allowances for "semi-standard" C
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:36:16  lwall
  * patch1: you may now use "die" and "caller" in a signal handler
- * 
+ *
  * Revision 4.0  91/03/20  01:04:18  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
diff --git a/gnu/usr.bin/perl/perl/cmd.h b/gnu/usr.bin/perl/perl/cmd.h
index 76ef5c8b58d9..da0fa8e7696d 100644
--- a/gnu/usr.bin/perl/perl/cmd.h
+++ b/gnu/usr.bin/perl/perl/cmd.h
@@ -1,4 +1,4 @@
-/* $RCSfile: cmd.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:35 $
+/* $RCSfile: cmd.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,19 +6,22 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: cmd.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:35  nate
  * PERL!
  *
  * Revision 4.0.1.2  92/06/08  12:01:02  lwall
  * patch20: removed implicit int declarations on funcions
- * 
+ *
  * Revision 4.0.1.1  91/06/07  10:28:50  lwall
  * patch4: new copyright notice
  * patch4: length($`), length($&), length($') now optimized to avoid string copy
- * 
+ *
  * Revision 4.0  91/03/20  01:04:34  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #define C_NULL 0
diff --git a/gnu/usr.bin/perl/perl/cons.c b/gnu/usr.bin/perl/perl/cons.c
index c926f7a86c96..bbf783ef7843 100644
--- a/gnu/usr.bin/perl/perl/cons.c
+++ b/gnu/usr.bin/perl/perl/cons.c
@@ -1,4 +1,4 @@
-/* $RCSfile: cons.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:35 $
+/* $RCSfile: cons.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: cons.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:32  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:35  nate
  * PERL!
  *
@@ -21,18 +24,18 @@
  * patch20: debugger sometimes displayed wrong source line
  * patch20: various error messages have been clarified
  * patch20: an eval block containing a null block or statement could dump core
- * 
+ *
  * Revision 4.0.1.2  91/11/05  16:15:13  lwall
  * patch11: debugger got confused over nested subroutine definitions
  * patch11: prepared for ctype implementations that don't define isascii()
- * 
+ *
  * Revision 4.0.1.1  91/06/07  10:31:15  lwall
  * patch4: new copyright notice
  * patch4: added global modifier for pattern matches
- * 
+ *
  * Revision 4.0  91/03/20  01:05:51  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -1224,7 +1227,7 @@ register ARG *arg;
 	case A_LEXPR:
 	    if (arg->arg_type == O_AASSIGN &&
 	      arg[i].arg_ptr.arg_arg->arg_type == O_LARRAY) {
-		char *name = 
+		char *name =
 		  stab_name(arg[i].arg_ptr.arg_arg[1].arg_ptr.arg_stab);
 
 		if (strnEQ("_GEN_",name, 5))	/* array for foreach */
diff --git a/gnu/usr.bin/perl/perl/consarg.c b/gnu/usr.bin/perl/perl/consarg.c
index 440fcfd0f1e9..d0d59b73c92a 100644
--- a/gnu/usr.bin/perl/perl/consarg.c
+++ b/gnu/usr.bin/perl/perl/consarg.c
@@ -1,4 +1,4 @@
-/* $RCSfile: consarg.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $
+/* $RCSfile: consarg.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:29 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,10 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: consarg.c,v $
+ * Revision 1.2  1994/09/11  03:17:29  gclarkii
+ * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h
+ * Added casts to shutup warnings in doio.c
+ *
  * Revision 1.1.1.1  1994/09/10  06:27:32  gclarkii
  * Initial import of Perl 4.046 bmaked
  *
@@ -17,24 +21,24 @@
  * patch20: modulus with highest bit in left operand set didn't always work
  * patch20: illegal lvalue message could be followed by core dump
  * patch20: deleted some minor memory leaks
- * 
+ *
  * Revision 4.0.1.3  91/11/05  16:21:16  lwall
  * patch11: random cleanup
  * patch11: added eval {}
  * patch11: added sort {} LIST
  * patch11: "foo" x -1 dumped core
  * patch11: substr() and vec() weren't allowed in an lvalue list
- * 
+ *
  * Revision 4.0.1.2  91/06/07  10:33:12  lwall
  * patch4: new copyright notice
  * patch4: length($`), length($&), length($') now optimized to avoid string copy
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:38:34  lwall
  * patch1: fixed "Bad free" error
- * 
+ *
  * Revision 4.0  91/03/20  01:06:15  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -200,9 +204,9 @@ ARG *arg3;
     }
     /*SUPPRESS 560*/
     if (chld = arg2) {
-	if (chld->arg_type == O_ITEM && 
-	    (hoistable[chld[1].arg_type&A_MASK] || 
-	     (type == O_ASSIGN && 
+	if (chld->arg_type == O_ITEM &&
+	    (hoistable[chld[1].arg_type&A_MASK] ||
+	     (type == O_ASSIGN &&
 	      ((chld[1].arg_type == A_READ && !(arg[1].arg_type & A_DONT))
 		||
 	       (chld[1].arg_type == A_INDREAD && !(arg[1].arg_type & A_DONT))
@@ -1074,7 +1078,7 @@ ARG *arg;
     if (arg->arg_type == O_CONCAT && arg[2].arg_type == A_EXPR) {
 	arg2 = arg[2].arg_ptr.arg_arg;
 	if (arg2->arg_type == O_ITEM && arg2[1].arg_type == A_READ) {
-	    arg->arg_type = O_RCAT;	
+	    arg->arg_type = O_RCAT;
 	    arg[2].arg_type = arg2[1].arg_type;
 	    arg[2].arg_ptr = arg2[1].arg_ptr;
 	    free_arg(arg2);
diff --git a/gnu/usr.bin/perl/perl/crypt.c b/gnu/usr.bin/perl/perl/crypt.c
index 3299a8663c6e..3e95f452cf7f 100644
--- a/gnu/usr.bin/perl/perl/crypt.c
+++ b/gnu/usr.bin/perl/perl/crypt.c
@@ -36,7 +36,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from static char sccsid[] = "@(#)crypt.c	5.11 (Berkeley) 6/25/91"; */
-static char rcsid[] = "$Header: /home/cvs/386BSD/src/lib/libc/gen/crypt.c,v 1.6 1993/08/29 22:03:56 nate Exp $";
+static char rcsid[] = "$Header: /home/ncvs/src/gnu/usr.bin/perl/perl/crypt.c,v 1.1.1.1 1994/09/10 06:27:37 gclarkii Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
@@ -44,7 +44,7 @@ static char rcsid[] = "$Header: /home/cvs/386BSD/src/lib/libc/gen/crypt.c,v 1.6
 
 /*
  * UNIX password, and DES, encryption.
- * 
+ *
  * since this is non-exportable, this is just a dummy.  if you want real
  * encryption, make sure you've got libcrypt.a around.
  */
diff --git a/gnu/usr.bin/perl/perl/doarg.c b/gnu/usr.bin/perl/perl/doarg.c
index 7c03bffc9ca9..2a647875b536 100644
--- a/gnu/usr.bin/perl/perl/doarg.c
+++ b/gnu/usr.bin/perl/perl/doarg.c
@@ -1,4 +1,4 @@
-/* $RCSfile: doarg.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $
+/* $RCSfile: doarg.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:30 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,10 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: doarg.c,v $
+ * Revision 1.2  1994/09/11  03:17:30  gclarkii
+ * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h
+ * Added casts to shutup warnings in doio.c
+ *
  * Revision 1.1.1.1  1994/09/10  06:27:32  gclarkii
  * Initial import of Perl 4.046 bmaked
  *
@@ -18,7 +22,7 @@
  * Revision 4.0.1.7  92/06/11  21:07:11  lwall
  * patch34: join with null list attempted negative allocation
  * patch34: sprintf("%6.4s", "abcdefg") didn't print "abcd  "
- * 
+ *
  * Revision 4.0.1.6  92/06/08  12:34:30  lwall
  * patch20: removed implicit int declarations on funcions
  * patch20: pattern modifiers i and o didn't interact right
@@ -28,10 +32,10 @@
  * patch20: usersub routines didn't reclaim temp values soon enough
  * patch20: ($<,$>) = ... didn't work on some architectures
  * patch20: added Atari ST portability
- * 
+ *
  * Revision 4.0.1.5  91/11/11  16:31:58  lwall
  * patch19: added little-endian pack/unpack options
- * 
+ *
  * Revision 4.0.1.4  91/11/05  16:35:06  lwall
  * patch11: /$foo/o optimizer could access deallocated data
  * patch11: minimum match length calculation in regexp is now cumulative
@@ -40,10 +44,10 @@
  * patch11: sprintf() now supports any length of s field
  * patch11: indirect subroutine calls through magic vars (e.g. &$1) didn't work
  * patch11: defined(&$foo) and undef(&$foo) didn't work
- * 
+ *
  * Revision 4.0.1.3  91/06/10  01:18:41  lwall
  * patch10: pack(hh,1) dumped core
- * 
+ *
  * Revision 4.0.1.2  91/06/07  10:42:17  lwall
  * patch4: new copyright notice
  * patch4: // wouldn't use previous pattern if it started with a null character
@@ -53,14 +57,14 @@
  * patch4: chop("") was returning "\0" rather than ""
  * patch4: vector logical operations &, | and ^ sometimes returned null string
  * patch4: syscall couldn't pass numbers with most significant bit set on sparcs
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:40:14  lwall
  * patch1: fixed undefined environ problem
  * patch1: fixed debugger coredump on subroutines
- * 
+ *
  * Revision 4.0  91/03/20  01:06:42  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -911,7 +915,7 @@ register STR **sarg;
 		xlen = strlen(xs);
 		break;
 	    case '0': case '1': case '2': case '3': case '4':
-	    case '5': case '6': case '7': case '8': case '9': 
+	    case '5': case '6': case '7': case '8': case '9':
 	    case '.': case '#': case '-': case '+': case ' ':
 		continue;
 	    case 'l':
diff --git a/gnu/usr.bin/perl/perl/doio.c b/gnu/usr.bin/perl/perl/doio.c
index a603febfc9b9..9c0731f6099f 100644
--- a/gnu/usr.bin/perl/perl/doio.c
+++ b/gnu/usr.bin/perl/perl/doio.c
@@ -1,4 +1,4 @@
-/* $RCSfile: doio.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $
+/* $RCSfile: doio.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:32 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,10 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: doio.c,v $
+ * Revision 1.2  1994/09/11  03:17:32  gclarkii
+ * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h
+ * Added casts to shutup warnings in doio.c
+ *
  * Revision 1.1.1.1  1994/09/10  06:27:32  gclarkii
  * Initial import of Perl 4.046 bmaked
  *
@@ -17,7 +21,7 @@
  *
  * Revision 4.0.1.6  92/06/11  21:08:16  lwall
  * patch34: some systems don't declare h_errno extern in header files
- * 
+ *
  * Revision 4.0.1.5  92/06/08  13:00:21  lwall
  * patch20: some machines don't define ENOTSOCK in errno.h
  * patch20: new warnings for failed use of stat operators on filenames with \n
@@ -27,7 +31,7 @@
  * patch20: fixed memory leak on system() for vfork() machines
  * patch20: get*by* routines now return something useful in a scalar context
  * patch20: h_errno now accessible via $?
- * 
+ *
  * Revision 4.0.1.4  91/11/05  16:51:43  lwall
  * patch11: prepared for ctype implementations that don't define isascii()
  * patch11: perl mistook some streams for sockets because they return mode 0 too
@@ -36,11 +40,11 @@
  * patch11: truncate on a closed filehandle could dump
  * patch11: stats of _ forgot whether prior stat was actually lstat
  * patch11: -T returned true on NFS directory
- * 
+ *
  * Revision 4.0.1.3  91/06/10  01:21:19  lwall
  * patch10: read didn't work from character special files open for writing
  * patch10: close-on-exec wrongly set on system file descriptors
- * 
+ *
  * Revision 4.0.1.2  91/06/07  10:53:39  lwall
  * patch4: new copyright notice
  * patch4: system fd's are now treated specially
@@ -48,13 +52,13 @@
  * patch4: character special files now opened with bidirectional stdio buffers
  * patch4: taintchecks could improperly modify parent in vfork()
  * patch4: many, many itty-bitty portability fixes
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:41:06  lwall
  * patch1: hopefully straightened out some of the Xenix mess
- * 
+ *
  * Revision 4.0  91/03/20  01:07:06  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -1000,7 +1004,7 @@ STR *str;
 
     if (!str->str_pok)
 	return TRUE;
-    s = str->str_ptr; 
+    s = str->str_ptr;
     send = s + str->str_cur;
     while (isSPACE(*s))
 	s++;
@@ -1012,7 +1016,7 @@ STR *str;
 	s++;
     if (s == send)
 	return TRUE;
-    if (*s == '.') 
+    if (*s == '.')
 	s++;
     else if (s == str->str_ptr)
 	return FALSE;
@@ -1648,7 +1652,7 @@ int *arglast;
 	st[sp] = &str_yes;
 	break;
     }
-    
+
     return sp;
 
 nuts:
@@ -1692,7 +1696,7 @@ int *arglast;
 	    goto nuts2;
 	break;
     }
-    
+
     return sp;
 
 nuts:
diff --git a/gnu/usr.bin/perl/perl/dolist.c b/gnu/usr.bin/perl/perl/dolist.c
index f966479dbef7..448a260ad4e7 100644
--- a/gnu/usr.bin/perl/perl/dolist.c
+++ b/gnu/usr.bin/perl/perl/dolist.c
@@ -1,4 +1,4 @@
-/* $RCSfile: dolist.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $
+/* $RCSfile: dolist.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: dolist.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:32  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:36  nate
  * PERL!
  *
@@ -19,11 +22,11 @@
  * patch20: splice with negative offset didn't work with $[ = 1
  * patch20: fixed some memory leaks in splice
  * patch20: scalar keys %array now counts keys for you
- * 
+ *
  * Revision 4.0.1.4  91/11/11  16:33:19  lwall
  * patch19: added little-endian pack/unpack options
  * patch19: sort $subname was busted by changes in 4.018
- * 
+ *
  * Revision 4.0.1.3  91/11/05  17:07:02  lwall
  * patch11: prepared for ctype implementations that don't define isascii()
  * patch11: /$foo/o optimizer could access deallocated data
@@ -34,10 +37,10 @@
  * patch11: grep of a split lost its values
  * patch11: added sort {} LIST
  * patch11: multiple reallocations now avoided in 1 .. 100000
- * 
+ *
  * Revision 4.0.1.2  91/06/10  01:22:15  lwall
  * patch10: //g only worked first time through
- * 
+ *
  * Revision 4.0.1.1  91/06/07  10:58:28  lwall
  * patch4: new copyright notice
  * patch4: added global modifier for pattern matches
@@ -45,10 +48,10 @@
  * patch4: //o and s///o now optimize themselves fully at runtime
  * patch4: $` was busted inside s///
  * patch4: caller($arg) didn't work except under debugger
- * 
+ *
  * Revision 4.0  91/03/20  01:08:03  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -558,7 +561,7 @@ int *arglast;
 		zaps = str_get(afetch(ary,sp,FALSE));
 		zapb = (int) *zaps;
 	}
-	
+
 	while (iters > 0 && (!zapb)) {
 	    iters--,sp--;
 	    if (iters > 0) {
@@ -1593,7 +1596,7 @@ int *arglast;
 
 	    if (stab) {
 		if (!stab_sub(stab) || !(sortcmd = stab_sub(stab)->cmd))
-		    fatal("Undefined subroutine \"%s\" in sort", 
+		    fatal("Undefined subroutine \"%s\" in sort",
 			stab_ename(stab));
 		stash = stab_estash(stab);
 	    }
diff --git a/gnu/usr.bin/perl/perl/dump.c b/gnu/usr.bin/perl/perl/dump.c
index c9551691fb40..7a07135efb37 100644
--- a/gnu/usr.bin/perl/perl/dump.c
+++ b/gnu/usr.bin/perl/perl/dump.c
@@ -1,4 +1,4 @@
-/* $RCSfile: dump.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $
+/* $RCSfile: dump.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:33 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,10 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: dump.c,v $
+ * Revision 1.2  1994/09/11  03:17:33  gclarkii
+ * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h
+ * Added casts to shutup warnings in doio.c
+ *
  * Revision 1.1.1.1  1994/09/10  06:27:32  gclarkii
  * Initial import of Perl 4.046 bmaked
  *
@@ -15,13 +19,13 @@
  * Revision 4.0.1.2  92/06/08  13:14:22  lwall
  * patch20: removed implicit int declarations on funcions
  * patch20: fixed confusion between a *var's real name and its effective name
- * 
+ *
  * Revision 4.0.1.1  91/06/07  10:58:44  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:08:25  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
diff --git a/gnu/usr.bin/perl/perl/eval.c b/gnu/usr.bin/perl/perl/eval.c
index fbd2fdd441f6..40155f5549fc 100644
--- a/gnu/usr.bin/perl/perl/eval.c
+++ b/gnu/usr.bin/perl/perl/eval.c
@@ -1,4 +1,4 @@
-/* $RCSfile: eval.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $
+/* $RCSfile: eval.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: eval.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:32  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:36  nate
  * PERL!
  *
@@ -18,7 +21,7 @@
  * patch20: dbmclose(%array) didn't work
  * patch20: added ... as variant on ..
  * patch20: O_PIPE conflicted with Atari
- * 
+ *
  * Revision 4.0.1.3  91/11/05  17:15:21  lwall
  * patch11: prepared for ctype implementations that don't define isascii()
  * patch11: various portability fixes
@@ -28,7 +31,7 @@
  * patch11: a last statement outside any block caused occasional core dumps
  * patch11: missing arguments caused core dump in -D8 code
  * patch11: eval 'stuff' now optimized to eval {stuff}
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:07:23  lwall
  * patch4: new copyright notice
  * patch4: length($`), length($&), length($') now optimized to avoid string copy
@@ -37,14 +40,14 @@
  * patch4: added $^P variable to control calling of perldb routines
  * patch4: taintchecks could improperly modify parent in vfork()
  * patch4: many, many itty-bitty portability fixes
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:43:48  lwall
  * patch1: fixed failed fork to return undef as documented
  * patch1: reduced maximum branch distance in eval.c
- * 
+ *
  * Revision 4.0  91/03/20  01:16:48  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -1242,8 +1245,8 @@ register int sp;
 		lstr = (struct lstring*)str;
 		str->str_magic = st[1];
 		st[1]->str_rare = 's';
-		lstr->lstr_offset = tmps - str_get(st[1]); 
-		lstr->lstr_len = anum; 
+		lstr->lstr_offset = tmps - str_get(st[1]);
+		lstr->lstr_len = anum;
 	    }
 	}
 	break;
diff --git a/gnu/usr.bin/perl/perl/form.c b/gnu/usr.bin/perl/perl/form.c
index 57fc5de72e99..cfb7aed218c8 100644
--- a/gnu/usr.bin/perl/perl/form.c
+++ b/gnu/usr.bin/perl/perl/form.c
@@ -1,4 +1,4 @@
-/* $RCSfile: form.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $
+/* $RCSfile: form.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: form.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:33  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:36  nate
  * PERL!
  *
@@ -16,19 +19,19 @@
  * patch20: removed implicit int declarations on funcions
  * patch20: form feed for formats is now specifiable via $^L
  * patch20: Perl now distinguishes overlapped copies from non-overlapped
- * 
+ *
  * Revision 4.0.1.2  91/11/05  17:18:43  lwall
  * patch11: formats didn't fill their fields as well as they could
  * patch11: ^ fields chopped hyphens on line break
  * patch11: # fields could write outside allocated memory
- * 
+ *
  * Revision 4.0.1.1  91/06/07  11:07:59  lwall
  * patch4: new copyright notice
  * patch4: default top-of-form format is now FILEHANDLE_TOP
- * 
+ *
  * Revision 4.0  91/03/20  01:19:23  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
diff --git a/gnu/usr.bin/perl/perl/form.h b/gnu/usr.bin/perl/perl/form.h
index 1e3e6f458540..3f63289744ca 100644
--- a/gnu/usr.bin/perl/perl/form.h
+++ b/gnu/usr.bin/perl/perl/form.h
@@ -1,4 +1,4 @@
-/* $RCSfile: form.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $
+/* $RCSfile: form.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: form.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:36  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  11:08:20  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:19:37  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #define F_NULL 0
diff --git a/gnu/usr.bin/perl/perl/handy.h b/gnu/usr.bin/perl/perl/handy.h
index 46231aed9c6e..df719841233b 100644
--- a/gnu/usr.bin/perl/perl/handy.h
+++ b/gnu/usr.bin/perl/perl/handy.h
@@ -1,4 +1,4 @@
-/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:36 $
+/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,25 +6,28 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: handy.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:36  nate
  * PERL!
  *
  * Revision 4.0.1.4  92/06/08  13:23:17  lwall
  * patch20: isascii() may now be supplied by a library routine
  * patch20: Perl now distinguishes overlapped copies from non-overlapped
- * 
+ *
  * Revision 4.0.1.3  91/11/05  22:54:26  lwall
  * patch11: erratum
- * 
+ *
  * Revision 4.0.1.2  91/11/05  17:23:38  lwall
  * patch11: prepared for ctype implementations that don't define isascii()
- * 
+ *
  * Revision 4.0.1.1  91/06/07  11:09:56  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:22:15  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #ifdef NULL
diff --git a/gnu/usr.bin/perl/perl/hash.c b/gnu/usr.bin/perl/perl/hash.c
index 15cc116001b3..5d9b5940a90d 100644
--- a/gnu/usr.bin/perl/perl/hash.c
+++ b/gnu/usr.bin/perl/perl/hash.c
@@ -1,4 +1,4 @@
-/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:37 $
+/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: hash.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:33  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:37  nate
  * PERL!
  *
@@ -13,16 +16,16 @@
  * patch20: removed implicit int declarations on functions
  * patch20: delete could cause %array to give too low a count of buckets filled
  * patch20: hash tables now split only if the memory is available to do so
- * 
+ *
  * Revision 4.0.1.2  91/11/05  17:24:13  lwall
  * patch11: saberized perl
- * 
+ *
  * Revision 4.0.1.1  91/06/07  11:10:11  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:22:26  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
diff --git a/gnu/usr.bin/perl/perl/hash.h b/gnu/usr.bin/perl/perl/hash.h
index 858721f54318..ddf2a11b064e 100644
--- a/gnu/usr.bin/perl/perl/hash.h
+++ b/gnu/usr.bin/perl/perl/hash.h
@@ -1,4 +1,4 @@
-/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:37 $
+/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,18 +6,21 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: hash.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:35  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:37  nate
  * PERL!
  *
  * Revision 4.0.1.2  91/11/05  17:24:31  lwall
  * patch11: random cleanup
- * 
+ *
  * Revision 4.0.1.1  91/06/07  11:10:33  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:22:38  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #define FILLPCT 80		/* don't make greater than 99 */
diff --git a/gnu/usr.bin/perl/perl/malloc.c b/gnu/usr.bin/perl/perl/malloc.c
index 8bfee4064576..5cc86d910882 100644
--- a/gnu/usr.bin/perl/perl/malloc.c
+++ b/gnu/usr.bin/perl/perl/malloc.c
@@ -1,6 +1,9 @@
-/* $RCSfile: malloc.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:37 $
+/* $RCSfile: malloc.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $
  *
  * $Log: malloc.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:33  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:37  nate
  * PERL!
  *
@@ -8,19 +11,19 @@
  * patch20: removed implicit int declarations on functions
  * patch20: hash tables now split only if the memory is available to do so
  * patch20: realloc(0, size) now does malloc in case library routines call it
- * 
+ *
  * Revision 4.0.1.3  91/11/05  17:57:40  lwall
  * patch11: safe malloc code now integrated into Perl's malloc when possible
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:20:45  lwall
  * patch4: many, many itty-bitty portability fixes
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:48:31  lwall
  * patch1: Configure now figures out malloc ptr type
- * 
+ *
  * Revision 4.0  91/03/20  01:28:52  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #ifndef lint
@@ -34,12 +37,12 @@ static char sccsid[] = "@(#)malloc.c	4.3 (Berkeley) 9/16/83";
  * malloc.c (Caltech) 2/21/82
  * Chris Kingsley, kingsley@cit-20.
  *
- * This is a very fast storage allocator.  It allocates blocks of a small 
+ * This is a very fast storage allocator.  It allocates blocks of a small
  * number of different sizes, and keeps free lists of each size.  Blocks that
- * don't exactly fit are passed up to the next larger size.  In this 
+ * don't exactly fit are passed up to the next larger size.  In this
  * implementation, the available sizes are 2^n-4 (or 2^n-12) bytes long.
  * This is designed for use in a program that uses vast quantities of memory,
- * but bombs when it runs out. 
+ * but bombs when it runs out.
  */
 
 #include "EXTERN.h"
@@ -158,7 +161,7 @@ malloc(nbytes)
 	 * space used per block for accounting.
 	 */
   	nbytes += sizeof (union overhead) + RSLOP;
-  	nbytes = (nbytes + 3) &~ 3; 
+  	nbytes = (nbytes + 3) &~ 3;
   	shiftr = (nbytes - 1) >> 2;
 	/* apart from this loop, this is O(1) */
   	while (shiftr >>= 1)
@@ -167,7 +170,7 @@ malloc(nbytes)
 	 * If nothing in hash bucket right now,
 	 * request more memory from the system.
 	 */
-  	if (nextf[bucket] == NULL)    
+  	if (nextf[bucket] == NULL)
   		morecore(bucket);
   	if ((p = (union overhead *)nextf[bucket]) == NULL) {
 #ifdef safemalloc
@@ -253,7 +256,7 @@ morecore(bucket)
 	/* take 2k unless the block is bigger than that */
   	rnu = (bucket <= 8) ? 11 : bucket + 3;
 #else
-	/* take 16k unless the block is bigger than that 
+	/* take 16k unless the block is bigger than that
 	   (80286s like large segments!), probably good on the atari too */
   	rnu = (bucket <= 11) ? 14 : bucket + 3;
 #endif
@@ -291,7 +294,7 @@ morecore(bucket)
 void
 free(mp)
 	MALLOCPTRTYPE *mp;
-{   
+{
   	register MEM_SIZE size;
 	register union overhead *op;
 	char *cp = (char*)mp;
@@ -350,9 +353,9 @@ int reall_srchlen = 4;	/* 4 should be plenty, -1 =>'s whole list */
 
 MALLOCPTRTYPE *
 realloc(mp, nbytes)
-	MALLOCPTRTYPE *mp; 
+	MALLOCPTRTYPE *mp;
 	MEM_SIZE nbytes;
-{   
+{
   	register MEM_SIZE onb;
 	union overhead *op;
   	char *res;
@@ -416,7 +419,7 @@ realloc(mp, nbytes)
 			 * space used per block for accounting.
 			 */
 			nbytes += sizeof (union overhead) + RSLOP;
-			nbytes = (nbytes + 3) &~ 3; 
+			nbytes = (nbytes + 3) &~ 3;
 			op->ov_size = nbytes - 1;
 			*((u_int *)((caddr_t)op + nbytes - RSLOP)) = RMAGIC;
 		}
@@ -477,7 +480,7 @@ findbucket(freep, srchlen)
 #ifdef MSTATS
 /*
  * mstats - print out statistics about malloc
- * 
+ *
  * Prints two lines of numbers, one showing the length of the free list
  * for each size category, the second showing the number of mallocs -
  * frees for each size category.
diff --git a/gnu/usr.bin/perl/perl/perl.c b/gnu/usr.bin/perl/perl/perl.c
index f727d1f5bd3f..4d1a7ae6bd4c 100644
--- a/gnu/usr.bin/perl/perl/perl.c
+++ b/gnu/usr.bin/perl/perl/perl.c
@@ -1,4 +1,4 @@
-char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.2 $$Date: 1994/10/27 23:16:54 $\nPatch level: ###\n";
+char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.3 $$Date: 1995/05/28 19:21:54 $\nPatch level: ###\n";
 /*
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,10 @@ char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.2 $$Date: 1994/10/27 23:16:54 $
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: perl.c,v $
+ * Revision 1.3  1995/05/28  19:21:54  ache
+ * Fix $] variable value (version number), close PR 449
+ * Submitted by: Bill Fenner <fenner@parc.xerox.com>
+ *
  * Revision 1.2  1994/10/27  23:16:54  wollman
  * Convince Perl to that is is part of the system, as /usr/bin/perl (binary)
  * and /usr/share/perl (library).  The latter was chosen as analogous to other
@@ -32,11 +36,11 @@ char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.2 $$Date: 1994/10/27 23:16:54 $
  * patch20: eval "1 #comment" didn't work
  * patch20: couldn't require . files
  * patch20: semantic compilation errors didn't abort execution
- * 
+ *
  * Revision 4.0.1.6  91/11/11  16:38:45  lwall
  * patch19: default arg for shift was wrong after first subroutine definition
  * patch19: op/regexp.t failed from missing arg to bcmp()
- * 
+ *
  * Revision 4.0.1.5  91/11/05  18:03:32  lwall
  * patch11: random cleanup
  * patch11: $0 was being truncated at times
@@ -45,25 +49,25 @@ char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.2 $$Date: 1994/10/27 23:16:54 $
  * patch11: prepared for ctype implementations that don't define isascii()
  * patch11: added eval {}
  * patch11: eval confused by string containing null
- * 
+ *
  * Revision 4.0.1.4  91/06/10  01:23:07  lwall
  * patch10: perl -v printed incorrect copyright notice
- * 
+ *
  * Revision 4.0.1.3  91/06/07  11:40:18  lwall
  * patch4: changed old $^P to $^X
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:26:16  lwall
  * patch4: new copyright notice
  * patch4: added $^P variable to control calling of perldb routines
  * patch4: added $^F variable to specify maximum system fd, default 2
  * patch4: debugger lost track of lines in eval
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:49:05  lwall
  * patch1: fixed undefined environ problem
- * 
+ *
  * Revision 4.0  91/03/20  01:37:44  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 /*SUPPRESS 560*/
@@ -1054,7 +1058,7 @@ int *arglast;
 	}
 	tmpfilename = savestr(specfilename);
 	if (*tmpfilename == '/' ||
-	    (*tmpfilename == '.' && 
+	    (*tmpfilename == '.' &&
 		(tmpfilename[1] == '/' ||
 		 (tmpfilename[1] == '.' && tmpfilename[2] == '/'))))
 	{
diff --git a/gnu/usr.bin/perl/perl/perl.h b/gnu/usr.bin/perl/perl/perl.h
index 8249c62bd492..7693aa0c8157 100644
--- a/gnu/usr.bin/perl/perl/perl.h
+++ b/gnu/usr.bin/perl/perl/perl.h
@@ -1,4 +1,4 @@
-/* $RCSfile: perl.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:35 $
+/* $RCSfile: perl.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: perl.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:35  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:35  nate
  * PERL!
  *
@@ -17,32 +20,32 @@
  * patch20: bcopy() and memcpy() now tested for overlap safety
  * patch20: Perl now distinguishes overlapped copies from non-overlapped
  * patch20: removed implicit int declarations on functions
- * 
+ *
  * Revision 4.0.1.5  91/11/11  16:41:07  lwall
  * patch19: uts wrongly defines S_ISDIR() et al
  * patch19: too many preprocessors can't expand a macro right in #if
  * patch19: added little-endian pack/unpack options
- * 
+ *
  * Revision 4.0.1.4  91/11/05  18:06:10  lwall
  * patch11: various portability fixes
  * patch11: added support for dbz
  * patch11: added some support for 64-bit integers
  * patch11: hex() didn't understand leading 0x
- * 
+ *
  * Revision 4.0.1.3  91/06/10  01:25:10  lwall
  * patch10: certain pattern optimizations were botched
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:28:33  lwall
  * patch4: new copyright notice
  * patch4: made some allowances for "semi-standard" C
  * patch4: many, many itty-bitty portability fixes
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:49:51  lwall
  * patch1: hopefully straightened out some of the Xenix mess
- * 
+ *
  * Revision 4.0  91/03/20  01:37:56  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #define VOIDWANT 1
diff --git a/gnu/usr.bin/perl/perl/perly.c b/gnu/usr.bin/perl/perl/perly.c
index 1084cc4d2593..9e314cd91f78 100644
--- a/gnu/usr.bin/perl/perl/perly.c
+++ b/gnu/usr.bin/perl/perl/perly.c
@@ -2800,7 +2800,7 @@ case 149:
 {   static char p[]="/\\s+/";
 			    char *oldend = bufend;
 			    ARG *oldarg = yylval.arg;
-			    
+
 			    bufend=p+5;
 			    (void)scanpat(p);
 			    bufend=oldend;
diff --git a/gnu/usr.bin/perl/perl/regcomp.c b/gnu/usr.bin/perl/perl/regcomp.c
index 8337e9cfd0d5..0287778f2878 100644
--- a/gnu/usr.bin/perl/perl/regcomp.c
+++ b/gnu/usr.bin/perl/perl/regcomp.c
@@ -7,9 +7,12 @@
  * blame Henry for some of the lack of readability.
  */
 
-/* $RCSfile: regcomp.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $
+/* $RCSfile: regcomp.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $
  *
  * $Log: regcomp.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:33  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:39  nate
  * PERL!
  *
@@ -18,27 +21,27 @@
  * patch20: /^stuff/ wrongly assumed an implicit $* == 1
  * patch20: /x{0}/ was wrongly interpreted as /x{0,}/
  * patch20: added \W, \S and \D inside /[...]/
- * 
+ *
  * Revision 4.0.1.4  91/11/05  22:55:14  lwall
  * patch11: Erratum
- * 
+ *
  * Revision 4.0.1.3  91/11/05  18:22:28  lwall
  * patch11: minimum match length calculation in regexp is now cumulative
  * patch11: initial .* in pattern had dependency on value of $*
  * patch11: certain patterns made use of garbage pointers from uncleared memory
  * patch11: prepared for ctype implementations that don't define isascii()
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:48:24  lwall
  * patch4: new copyright notice
  * patch4: /(x+) \1/ incorrectly optimized to not match "xxx xx"
  * patch4: // wouldn't use previous pattern if it started with a null character
- * 
+ *
  * Revision 4.0.1.1  91/04/12  09:04:45  lwall
  * patch1: random cleanup in cpp namespace
- * 
+ *
  * Revision 4.0  91/03/20  01:39:01  lwall
  * 4.0 baseline.
- * 
+ *
  */
 /*SUPPRESS 112*/
 /*
@@ -1321,7 +1324,7 @@ regexp *r;
 		s += regarglen[op];
 		if (next == NULL)		/* Next ptr. */
 			fprintf(stderr,"(0)");
-		else 
+		else
 			fprintf(stderr,"(%d)", (s-r->program)+(next-s));
 		s += 3;
 		if (op == ANYOF) {
diff --git a/gnu/usr.bin/perl/perl/regcomp.h b/gnu/usr.bin/perl/perl/regcomp.h
index 6dcd482fcd5f..b6b8c182aa3b 100644
--- a/gnu/usr.bin/perl/perl/regcomp.h
+++ b/gnu/usr.bin/perl/perl/regcomp.h
@@ -1,15 +1,18 @@
-/* $RCSfile: regcomp.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $
+/* $RCSfile: regcomp.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $
  *
  * $Log: regcomp.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:35  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:39  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  11:49:40  lwall
  * patch4: no change
- * 
+ *
  * Revision 4.0  91/03/20  01:39:09  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 /*
diff --git a/gnu/usr.bin/perl/perl/regexec.c b/gnu/usr.bin/perl/perl/regexec.c
index 7802465f734d..b8353061b256 100644
--- a/gnu/usr.bin/perl/perl/regexec.c
+++ b/gnu/usr.bin/perl/perl/regexec.c
@@ -7,9 +7,12 @@
  * blame Henry for some of the lack of readability.
  */
 
-/* $RCSfile: regexec.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $
+/* $RCSfile: regexec.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $
  *
  * $Log: regexec.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:33  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:39  nate
  * PERL!
  *
@@ -17,21 +20,21 @@
  * patch20: pattern modifiers i and g didn't interact right
  * patch20: in some cases $` and $' didn't get set by match
  * patch20: /x{0}/ was wrongly interpreted as /x{0,}/
- * 
+ *
  * Revision 4.0.1.3  91/11/05  18:23:55  lwall
  * patch11: prepared for ctype implementations that don't define isascii()
  * patch11: initial .* in pattern had dependency on value of $*
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:50:33  lwall
  * patch4: new copyright notice
  * patch4: // wouldn't use previous pattern if it started with a null character
- * 
+ *
  * Revision 4.0.1.1  91/04/12  09:07:39  lwall
  * patch1: regexec only allocated space for 9 subexpresssions
- * 
+ *
  * Revision 4.0  91/03/20  01:39:16  lwall
  * 4.0 baseline.
- * 
+ *
  */
 /*SUPPRESS 112*/
 /*
@@ -219,7 +222,7 @@ int safebase;	/* no need to remember string in subbase */
 		New(1102,regmystartp,regmyp_size,char*);
 		New(1102,regmyendp,  regmyp_size,char*);
 	    }
-	
+
 	}
 
 	/* Simplest case:  anchored match need be tried only once. */
@@ -629,7 +632,7 @@ char *prog;
 		case BOUND:
 			if (locinput == regbol)	/* was last char in word? */
 				ln = isALNUM(regprev);
-			else 
+			else
 				ln = isALNUM(locinput[-1]);
 			n = isALNUM(nextchar); /* is next char in word? */
 			if ((ln == n) == (OP(scan) == BOUND))
diff --git a/gnu/usr.bin/perl/perl/regexp.h b/gnu/usr.bin/perl/perl/regexp.h
index 66a1b8818d8f..634b19b913ce 100644
--- a/gnu/usr.bin/perl/perl/regexp.h
+++ b/gnu/usr.bin/perl/perl/regexp.h
@@ -5,24 +5,27 @@
  * not the System V one.
  */
 
-/* $RCSfile: regexp.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $
+/* $RCSfile: regexp.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $
  *
  * $Log: regexp.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:35  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:39  nate
  * PERL!
  *
  * Revision 4.0.1.2  91/11/05  18:24:31  lwall
  * patch11: minimum match length calculation in regexp is now cumulative
  * patch11: initial .* in pattern had dependency on value of $*
- * 
+ *
  * Revision 4.0.1.1  91/06/07  11:51:18  lwall
  * patch4: new copyright notice
  * patch4: // wouldn't use previous pattern if it started with a null character
  * patch4: $` was busted inside s///
- * 
+ *
  * Revision 4.0  91/03/20  01:39:23  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 typedef struct regexp {
diff --git a/gnu/usr.bin/perl/perl/spat.h b/gnu/usr.bin/perl/perl/spat.h
index 2a840e2855fb..7c392b0de11a 100644
--- a/gnu/usr.bin/perl/perl/spat.h
+++ b/gnu/usr.bin/perl/perl/spat.h
@@ -1,4 +1,4 @@
-/* $RCSfile: spat.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $
+/* $RCSfile: spat.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,16 +6,19 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: spat.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:35  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:39  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  11:51:59  lwall
  * patch4: new copyright notice
  * patch4: added global modifier for pattern matches
- * 
+ *
  * Revision 4.0  91/03/20  01:39:36  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 struct scanpat {
diff --git a/gnu/usr.bin/perl/perl/stab.c b/gnu/usr.bin/perl/perl/stab.c
index 70827255d7bf..e34aa94028b7 100644
--- a/gnu/usr.bin/perl/perl/stab.c
+++ b/gnu/usr.bin/perl/perl/stab.c
@@ -1,4 +1,4 @@
-/* $RCSfile: stab.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $
+/* $RCSfile: stab.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: stab.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:33  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:39  nate
  * PERL!
  *
@@ -18,14 +21,14 @@
  * patch20: the debugger made perl forget the last pattern used by //
  * patch20: paragraph mode now skips extra newlines automatically
  * patch20: ($<,$>) = ... didn't work on some architectures
- * 
+ *
  * Revision 4.0.1.3  91/11/05  18:35:33  lwall
  * patch11: length($x) was sometimes wrong for numeric $x
  * patch11: perl now issues warning if $SIG{'ALARM'} is referenced
  * patch11: *foo = undef coredumped
  * patch11: solitary subroutine references no longer trigger typo warnings
  * patch11: local(*FILEHANDLE) had a memory leak
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:55:53  lwall
  * patch4: new copyright notice
  * patch4: added $^P variable to control calling of perldb routines
@@ -34,14 +37,14 @@
  * patch4: default top-of-form format is now FILEHANDLE_TOP
  * patch4: length($`), length($&), length($') now optimized to avoid string copy
  * patch4: $^D |= 1024 now does syntax tree dump at run-time
- * 
+ *
  * Revision 4.0.1.1  91/04/12  09:10:24  lwall
  * patch1: Configure now differentiates getgroups() type from getgid() type
  * patch1: you may now use "die" and "caller" in a signal handler
- * 
+ *
  * Revision 4.0  91/03/20  01:39:41  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -1038,7 +1041,7 @@ register STAB *stab;
 ARRAY *stab_array(stab)
 register STAB *stab;
 {
-    if (((STBP*)(stab->str_ptr))->stbp_array) 
+    if (((STBP*)(stab->str_ptr))->stbp_array)
 	return ((STBP*)(stab->str_ptr))->stbp_array;
     else
 	return ((STBP*)(aadd(stab)->str_ptr))->stbp_array;
diff --git a/gnu/usr.bin/perl/perl/stab.h b/gnu/usr.bin/perl/perl/stab.h
index 7bce082e7a9a..9da5a4ac5282 100644
--- a/gnu/usr.bin/perl/perl/stab.h
+++ b/gnu/usr.bin/perl/perl/stab.h
@@ -1,4 +1,4 @@
-/* $RCSfile: stab.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $
+/* $RCSfile: stab.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,23 +6,26 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: stab.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:35  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:39  nate
  * PERL!
  *
  * Revision 4.0.1.3  92/06/08  15:33:44  lwall
  * patch20: fixed confusion between a *var's real name and its effective name
  * patch20: ($<,$>) = ... didn't work on some architectures
- * 
+ *
  * Revision 4.0.1.2  91/11/05  18:36:15  lwall
  * patch11: length($x) was sometimes wrong for numeric $x
- * 
+ *
  * Revision 4.0.1.1  91/06/07  11:56:35  lwall
  * patch4: new copyright notice
  * patch4: length($`), length($&), length($') now optimized to avoid string copy
- * 
+ *
  * Revision 4.0  91/03/20  01:39:49  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 struct stabptrs {
diff --git a/gnu/usr.bin/perl/perl/str.c b/gnu/usr.bin/perl/perl/str.c
index f034292e1076..0f8b36d793c7 100644
--- a/gnu/usr.bin/perl/perl/str.c
+++ b/gnu/usr.bin/perl/perl/str.c
@@ -1,4 +1,4 @@
-/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $
+/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: str.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:33  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:39  nate
  * PERL!
  *
@@ -14,7 +17,7 @@
  *
  * Revision 4.0.1.6  92/06/11  21:14:21  lwall
  * patch34: quotes containing subscripts containing variables didn't parse right
- * 
+ *
  * Revision 4.0.1.5  92/06/08  15:40:43  lwall
  * patch20: removed implicit int declarations on functions
  * patch20: Perl now distinguishes overlapped copies from non-overlapped
@@ -24,27 +27,27 @@
  * patch20: "$var{$foo'bar}" didn't scan subscript correctly
  * patch20: a splice on non-existent array elements could dump core
  * patch20: running taintperl explicitly now does checks even if $< == $>
- * 
+ *
  * Revision 4.0.1.4  91/11/05  18:40:51  lwall
  * patch11: $foo .= <BAR> could overrun malloced memory
  * patch11: \$ didn't always make it through double-quoter to regexp routines
  * patch11: prepared for ctype implementations that don't define isascii()
- * 
+ *
  * Revision 4.0.1.3  91/06/10  01:27:54  lwall
  * patch10: $) and $| incorrectly handled in run-time patterns
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:58:13  lwall
  * patch4: new copyright notice
  * patch4: taint check on undefined string could cause core dump
- * 
+ *
  * Revision 4.0.1.1  91/04/12  09:15:30  lwall
  * patch1: fixed undefined environ problem
  * patch1: substr($ENV{"PATH"},0,0) = "/foo:" didn't modify environment
  * patch1: $foo .= <BAR> could cause core dump for certain lengths of $foo
- * 
+ *
  * Revision 4.0  91/03/20  01:39:55  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -503,7 +506,7 @@ str_new(len)
 STRLEN len;
 {
     register STR *str;
-    
+
     if (freestrroot) {
 	str = freestrroot;
 	freestrroot = str->str_magic;
@@ -815,9 +818,9 @@ int append;
       screamer:
 	while (--cnt >= 0) {			/* this */	/* eat */
 	    if ((*bp++ = *ptr++) == newline)	/* really */	/* dust */
-		goto thats_all_folks;		/* screams */	/* sed :-) */ 
+		goto thats_all_folks;		/* screams */	/* sed :-) */
 	}
-	
+
 	if (shortbuffered) {			/* oh well, must extend */
 	    cnt = shortbuffered;
 	    shortbuffered = 0;
@@ -1023,7 +1026,7 @@ STR *src;
 		s++;
 	    s = scanident(s,send,tokenbuf);
 	    if (*t == '@' &&
-	      (!(stab = stabent(tokenbuf,FALSE)) || 
+	      (!(stab = stabent(tokenbuf,FALSE)) ||
 		 (*s == '{' ? !stab_xhash(stab) : !stab_xarray(stab)) )) {
 		str_ncat(str,"@",1);
 		s = ++t;
diff --git a/gnu/usr.bin/perl/perl/str.h b/gnu/usr.bin/perl/perl/str.h
index 7eb4b6971717..8e95749e246a 100644
--- a/gnu/usr.bin/perl/perl/str.h
+++ b/gnu/usr.bin/perl/perl/str.h
@@ -1,4 +1,4 @@
-/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:39 $
+/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,26 +6,29 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: str.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:35  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:39  nate
  * PERL!
  *
  * Revision 4.0.1.4  92/06/08  15:41:45  lwall
  * patch20: fixed confusion between a *var's real name and its effective name
  * patch20: removed implicit int declarations on functions
- * 
+ *
  * Revision 4.0.1.3  91/11/05  18:41:47  lwall
  * patch11: random cleanup
  * patch11: solitary subroutine references no longer trigger typo warnings
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:58:33  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0.1.1  91/04/12  09:16:12  lwall
  * patch1: you may now use "die" and "caller" in a signal handler
- * 
+ *
  * Revision 4.0  91/03/20  01:40:04  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 struct string {
diff --git a/gnu/usr.bin/perl/perl/tdoio.c b/gnu/usr.bin/perl/perl/tdoio.c
index 5dd8065b4f95..1cd6269e8c70 100644
--- a/gnu/usr.bin/perl/perl/tdoio.c
+++ b/gnu/usr.bin/perl/perl/tdoio.c
@@ -1,11 +1,14 @@
-/* $RCSfile: doio.c,v $$Revision: 1.2 $$Date: 1994/03/09 22:24:27 $
+/* $RCSfile: tdoio.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:36 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
- * $Log: doio.c,v $
+ * $Log: tdoio.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:36  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.2  1994/03/09  22:24:27  ache
  * (cast) added for last argument of semctl
  *
@@ -14,7 +17,7 @@
  *
  * Revision 4.0.1.6  92/06/11  21:08:16  lwall
  * patch34: some systems don't declare h_errno extern in header files
- * 
+ *
  * Revision 4.0.1.5  92/06/08  13:00:21  lwall
  * patch20: some machines don't define ENOTSOCK in errno.h
  * patch20: new warnings for failed use of stat operators on filenames with \n
@@ -24,7 +27,7 @@
  * patch20: fixed memory leak on system() for vfork() machines
  * patch20: get*by* routines now return something useful in a scalar context
  * patch20: h_errno now accessible via $?
- * 
+ *
  * Revision 4.0.1.4  91/11/05  16:51:43  lwall
  * patch11: prepared for ctype implementations that don't define isascii()
  * patch11: perl mistook some streams for sockets because they return mode 0 too
@@ -33,11 +36,11 @@
  * patch11: truncate on a closed filehandle could dump
  * patch11: stats of _ forgot whether prior stat was actually lstat
  * patch11: -T returned true on NFS directory
- * 
+ *
  * Revision 4.0.1.3  91/06/10  01:21:19  lwall
  * patch10: read didn't work from character special files open for writing
  * patch10: close-on-exec wrongly set on system file descriptors
- * 
+ *
  * Revision 4.0.1.2  91/06/07  10:53:39  lwall
  * patch4: new copyright notice
  * patch4: system fd's are now treated specially
@@ -45,13 +48,13 @@
  * patch4: character special files now opened with bidirectional stdio buffers
  * patch4: taintchecks could improperly modify parent in vfork()
  * patch4: many, many itty-bitty portability fixes
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:41:06  lwall
  * patch1: hopefully straightened out some of the Xenix mess
- * 
+ *
  * Revision 4.0  91/03/20  01:07:06  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -994,7 +997,7 @@ STR *str;
 
     if (!str->str_pok)
 	return TRUE;
-    s = str->str_ptr; 
+    s = str->str_ptr;
     send = s + str->str_cur;
     while (isSPACE(*s))
 	s++;
@@ -1006,7 +1009,7 @@ STR *str;
 	s++;
     if (s == send)
 	return TRUE;
-    if (*s == '.') 
+    if (*s == '.')
 	s++;
     else if (s == str->str_ptr)
 	return FALSE;
@@ -1642,7 +1645,7 @@ int *arglast;
 	st[sp] = &str_yes;
 	break;
     }
-    
+
     return sp;
 
 nuts:
@@ -1686,7 +1689,7 @@ int *arglast;
 	    goto nuts2;
 	break;
     }
-    
+
     return sp;
 
 nuts:
diff --git a/gnu/usr.bin/perl/perl/toke.c b/gnu/usr.bin/perl/perl/toke.c
index 34603cedf31b..bf2e1163f27b 100644
--- a/gnu/usr.bin/perl/perl/toke.c
+++ b/gnu/usr.bin/perl/perl/toke.c
@@ -1,4 +1,4 @@
-/* $RCSfile: toke.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:40 $
+/* $RCSfile: toke.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: toke.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:40  nate
  * PERL!
  *
@@ -15,10 +18,10 @@
  *
  * Revision 4.0.1.8  92/06/23  12:33:45  lwall
  * patch35: bad interaction between backslash and hyphen in tr///
- * 
+ *
  * Revision 4.0.1.7  92/06/11  21:16:30  lwall
  * patch34: expectterm incorrectly set to indicate start of program or block
- * 
+ *
  * Revision 4.0.1.6  92/06/08  16:03:49  lwall
  * patch20: an EXPR may now start with a bareword
  * patch20: print $fh EXPR can now expect term rather than operator in EXPR
@@ -31,10 +34,10 @@
  * patch20: 2. now eats the dot
  * patch20: <@ARGV> now notices @ARGV
  * patch20: tr/// now lets you say \-
- * 
+ *
  * Revision 4.0.1.5  91/11/11  16:45:51  lwall
  * patch19: default arg for shift was wrong after first subroutine definition
- * 
+ *
  * Revision 4.0.1.4  91/11/05  19:02:48  lwall
  * patch11: \x and \c were subject to double interpretation in regexps
  * patch11: prepared for ctype implementations that don't define isascii()
@@ -42,23 +45,23 @@
  * patch11: once-thru blocks didn't display right in the debugger
  * patch11: sort eval "whatever" didn't work
  * patch11: underscore is now allowed within literal octal and hex numbers
- * 
+ *
  * Revision 4.0.1.3  91/06/10  01:32:26  lwall
  * patch10: m'$foo' now treats string as single quoted
  * patch10: certain pattern optimizations were botched
- * 
+ *
  * Revision 4.0.1.2  91/06/07  12:05:56  lwall
  * patch4: new copyright notice
  * patch4: debugger lost track of lines in eval
  * patch4: //o and s///o now optimize themselves fully at runtime
  * patch4: added global modifier for pattern matches
- * 
+ *
  * Revision 4.0.1.1  91/04/12  09:18:18  lwall
  * patch1: perl -de "print" wouldn't stop at the first statement
- * 
+ *
  * Revision 4.0  91/03/20  01:42:14  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -1996,8 +1999,8 @@ char *start;
 	yylval.arg = Nullarg;
 	return s;
     }
-    tstr = yylval.arg[1].arg_ptr.arg_str; 
-    yylval.arg[1].arg_ptr.arg_str = Nullstr; 
+    tstr = yylval.arg[1].arg_ptr.arg_str;
+    yylval.arg[1].arg_ptr.arg_str = Nullstr;
     arg_free(yylval.arg);
     t = tstr->str_ptr;
     tlen = tstr->str_cur;
@@ -2011,8 +2014,8 @@ char *start;
 	yylval.arg = Nullarg;
 	return s;
     }
-    rstr = yylval.arg[1].arg_ptr.arg_str; 
-    yylval.arg[1].arg_ptr.arg_str = Nullstr; 
+    rstr = yylval.arg[1].arg_ptr.arg_str;
+    yylval.arg[1].arg_ptr.arg_str = Nullstr;
     arg_free(yylval.arg);
     r = rstr->str_ptr;
     rlen = rstr->str_cur;
@@ -2290,7 +2293,7 @@ int in_what;
 	leave = Nullch;
 	goto snarf_it;
 
-    case '"': 
+    case '"':
       do_double:
 	term = *s;
 	arg[1].arg_type = A_DOUBLE;
diff --git a/gnu/usr.bin/perl/perl/usersub.c b/gnu/usr.bin/perl/perl/usersub.c
index d0ee9525ef99..8c7cb65c47f6 100644
--- a/gnu/usr.bin/perl/perl/usersub.c
+++ b/gnu/usr.bin/perl/perl/usersub.c
@@ -1,22 +1,25 @@
-/* $RCSfile: usersub.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:40 $
+/* $RCSfile: usersub.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
  *
  *  This file contains stubs for routines that the user may define to
  *  set up glue routines for C libraries or to decrypt encrypted scripts
  *  for execution.
  *
  * $Log: usersub.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:40  nate
  * PERL!
  *
  * Revision 4.0.1.2  92/06/08  16:04:24  lwall
  * patch20: removed implicit int declarations on functions
- * 
+ *
  * Revision 4.0.1.1  91/11/11  16:47:17  lwall
  * patch19: deleted some unused functions from usersub.c
- * 
+ *
  * Revision 4.0  91/03/20  01:55:56  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "EXTERN.h"
diff --git a/gnu/usr.bin/perl/perl/util.c b/gnu/usr.bin/perl/perl/util.c
index 574898357382..fd4b43602934 100644
--- a/gnu/usr.bin/perl/perl/util.c
+++ b/gnu/usr.bin/perl/perl/util.c
@@ -1,4 +1,4 @@
-/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:40 $
+/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,42 +6,45 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: util.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:34  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:40  nate
  * PERL!
  *
  * Revision 4.0.1.6  92/06/11  21:18:47  lwall
  * patch34: boneheaded typo in my_bcopy()
- * 
+ *
  * Revision 4.0.1.5  92/06/08  16:08:37  lwall
  * patch20: removed implicit int declarations on functions
  * patch20: Perl now distinguishes overlapped copies from non-overlapped
  * patch20: fixed confusion between a *var's real name and its effective name
  * patch20: bcopy() and memcpy() now tested for overlap safety
  * patch20: added Atari ST portability
- * 
+ *
  * Revision 4.0.1.4  91/11/11  16:48:54  lwall
  * patch19: study was busted by 4.018
  * patch19: added little-endian pack/unpack options
- * 
+ *
  * Revision 4.0.1.3  91/11/05  19:18:26  lwall
  * patch11: safe malloc code now integrated into Perl's malloc when possible
  * patch11: index("little", "longer string") could visit faraway places
  * patch11: warn '-' x 10000 dumped core
  * patch11: forked exec on non-existent program now issues a warning
- * 
+ *
  * Revision 4.0.1.2  91/06/07  12:10:42  lwall
  * patch4: new copyright notice
  * patch4: made some allowances for "semi-standard" C
  * patch4: index() could blow up searching for null string
  * patch4: taintchecks could improperly modify parent in vfork()
  * patch4: exec would close files even if you cleared close-on-exec flag
- * 
+ *
  * Revision 4.0.1.1  91/04/12  09:19:25  lwall
  * patch1: random cleanup in cpp namespace
- * 
+ *
  * Revision 4.0  91/03/20  01:56:39  lwall
  * 4.0 baseline.
- * 
+ *
  */
 /*SUPPRESS 112*/
 
@@ -420,7 +423,7 @@ unsigned char fold[] = {
 	192,	193,	194,	195,	196,	197,	198,	199,
 	200,	201,	202,	203,	204,	205,	206,	207,
 	208,	209,	210,	211,	212,	213,	214,	215,
-	216,	217,	218,	219,	220,	221,	222,	223,	
+	216,	217,	218,	219,	220,	221,	222,	223,
 	224,	225,	226,	227,	228,	229,	230,	231,
 	232,	233,	234,	235,	236,	237,	238,	239,
 	240,	241,	242,	243,	244,	245,	246,	247,
@@ -682,7 +685,7 @@ STR *littlestr;
     register unsigned char *bigend;
     register unsigned char *littleend;
 
-    if ((pos = screamfirst[littlestr->str_rare]) < 0) 
+    if ((pos = screamfirst[littlestr->str_rare]) < 0)
 	return Nullch;
 #ifndef lint
     little = (unsigned char *)(littlestr->str_ptr);
diff --git a/gnu/usr.bin/perl/perl/util.h b/gnu/usr.bin/perl/perl/util.h
index ff64f8587806..003e44386010 100644
--- a/gnu/usr.bin/perl/perl/util.h
+++ b/gnu/usr.bin/perl/perl/util.h
@@ -1,4 +1,4 @@
-/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:40 $
+/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,24 +6,27 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: util.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:35  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:40  nate
  * PERL!
  *
  * Revision 4.0.1.4  92/06/11  21:19:36  lwall
  * patch34: pidgone() wasn't declared right
- * 
+ *
  * Revision 4.0.1.3  92/06/08  16:09:20  lwall
  * patch20: bcopy() and memcpy() now tested for overlap safety
- * 
+ *
  * Revision 4.0.1.2  91/11/05  19:18:40  lwall
  * patch11: safe malloc code now integrated into Perl's malloc when possible
- * 
+ *
  * Revision 4.0.1.1  91/06/07  12:11:00  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:56:48  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 EXT int *screamfirst INIT(Null(int*));
diff --git a/gnu/usr.bin/perl/sperl/Makefile b/gnu/usr.bin/perl/sperl/Makefile
index a073d0e82c14..af19d479ff3b 100644
--- a/gnu/usr.bin/perl/sperl/Makefile
+++ b/gnu/usr.bin/perl/sperl/Makefile
@@ -1,20 +1,20 @@
 #
-# 
+#
 
-PROG= suidperl 
+PROG= suidperl
 LINKS= ${BINDIR}/suidperl ${BINDIR}/sperl4.036
 
-SRCS+= array.c cmd.c cons.c consarg.c 
+SRCS+= array.c cmd.c cons.c consarg.c
 SRCS+= doarg.c doio.c dolist.c dump.c
-SRCS+= eval.c form.c hash.c malloc.c 
+SRCS+= eval.c form.c hash.c malloc.c
 SRCS+= perl.c perly.c regcomp.c regexec.c
-SRCS+= stab.c str.c toke.c util.c 
+SRCS+= stab.c str.c toke.c util.c
 SRCS+= usersub.c
 .PATH: ${.CURDIR}/../perl
 
 
 CFLAGS+= -I${.CURDIR}/../perl -DIAMSUID -DTAINT
-LDADD= -lm 
+LDADD= -lm
 DPADD= ${LIBM}
 
 LDADD+= -lcrypt
diff --git a/gnu/usr.bin/perl/tperl/Makefile b/gnu/usr.bin/perl/tperl/Makefile
index 939f6d582f3f..f76988edb40c 100644
--- a/gnu/usr.bin/perl/tperl/Makefile
+++ b/gnu/usr.bin/perl/tperl/Makefile
@@ -1,21 +1,21 @@
 #
-# 
+#
 
 PROG= tperl
 LINKS= ${BINDIR}/tperl ${BINDIR}/tperl4.036
 
-SRCS+= array.c cmd.c cons.c consarg.c 
+SRCS+= array.c cmd.c cons.c consarg.c
 SRCS+= doarg.c doio.c dolist.c dump.c
-SRCS+= eval.c form.c hash.c malloc.c 
+SRCS+= eval.c form.c hash.c malloc.c
 SRCS+= perl.c perly.c regcomp.c regexec.c
-SRCS+= stab.c str.c toke.c util.c 
+SRCS+= stab.c str.c toke.c util.c
 SRCS+= usersub.c
 .PATH: ${.CURDIR}/../perl
 
 
 CFLAGS+= -I${.CURDIR}/../perl -DTAINT
-LDADD+= -lm 
-DPADD= ${LIBM}  
+LDADD+= -lm
+DPADD= ${LIBM}
 
 LDADD+= -lcrypt
 DPADD+= ${LIBCRYPT}
diff --git a/gnu/usr.bin/perl/usub/usersub.c b/gnu/usr.bin/perl/usub/usersub.c
index ffbfbe155213..26fbcbccf62e 100644
--- a/gnu/usr.bin/perl/usub/usersub.c
+++ b/gnu/usr.bin/perl/usub/usersub.c
@@ -1,15 +1,20 @@
-/* $RCSfile: usersub.c,v $$Revision: 4.0.1.1 $$Date: 91/11/05 19:07:24 $
+/* $RCSfile: usersub.c,v $$Revision: 1.1 $$Date: 1995/03/24 04:33:54 $
+ *
+ * $Log: usersub.c,v $
+ * Revision 1.1  1995/03/24  04:33:54  jkh
+ * Bring back perl/usub as usub/, this time containing an updated curseperl
+ * which is also installed by default (the reason for which should also be
+ * plain shortly).
  *
- * $Log:	usersub.c,v $
  * Revision 4.0.1.1  91/11/05  19:07:24  lwall
  * patch11: there are now subroutines for calling back from C into Perl
- * 
+ *
  * Revision 4.0  91/03/20  01:56:34  lwall
  * 4.0 baseline.
- * 
+ *
  * Revision 3.0.1.1  90/08/09  04:06:10  lwall
  * patch19: Initial revision
- * 
+ *
  */
 
 #include "EXTERN.h"
@@ -33,7 +38,7 @@ int numargs;		/* how many args are pushed on the stack */
 {
     static ARG myarg[3];	/* fake syntax tree node */
     int arglast[3];
-    
+
     arglast[2] = sp;
     sp -= numargs;
     arglast[1] = sp--;
diff --git a/gnu/usr.bin/perl/x2p/EXTERN.h b/gnu/usr.bin/perl/x2p/EXTERN.h
index f3048edbc021..b0bb6d0162fb 100644
--- a/gnu/usr.bin/perl/x2p/EXTERN.h
+++ b/gnu/usr.bin/perl/x2p/EXTERN.h
@@ -1,4 +1,4 @@
-/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:11 $
+/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: EXTERN.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:54  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:11  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  12:11:15  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:56:53  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #undef EXT
diff --git a/gnu/usr.bin/perl/x2p/INTERN.h b/gnu/usr.bin/perl/x2p/INTERN.h
index e1967d2630b0..d8a8a3e2a349 100644
--- a/gnu/usr.bin/perl/x2p/INTERN.h
+++ b/gnu/usr.bin/perl/x2p/INTERN.h
@@ -1,4 +1,4 @@
-/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:11 $
+/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: INTERN.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:54  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:11  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  12:11:20  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:56:58  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #undef EXT
diff --git a/gnu/usr.bin/perl/x2p/Makefile b/gnu/usr.bin/perl/x2p/Makefile
index 3d371c618dab..cc6c2fe58dbc 100644
--- a/gnu/usr.bin/perl/x2p/Makefile
+++ b/gnu/usr.bin/perl/x2p/Makefile
@@ -8,7 +8,7 @@ CLEANFILES+= y.tab.h a2p.c
 LDADD= -lm
 DPADD= ${LIBM}
 
-MAN1+= a2p.1 s2p.1 h2ph.1  
+MAN1+= a2p.1 s2p.1 h2ph.1
 
 beforeinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m 555 ${.CURDIR}/s2p \
diff --git a/gnu/usr.bin/perl/x2p/a2p.h b/gnu/usr.bin/perl/x2p/a2p.h
index 7c6a66dde29c..cc59fb7ddf8e 100644
--- a/gnu/usr.bin/perl/x2p/a2p.h
+++ b/gnu/usr.bin/perl/x2p/a2p.h
@@ -1,4 +1,4 @@
-/* $RCSfile: a2p.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:09 $
+/* $RCSfile: a2p.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:53 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,18 +6,21 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: a2p.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:53  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:09  nate
  * PERL!
  *
  * Revision 4.0.1.2  92/06/08  16:12:23  lwall
  * patch20: hash tables now split only if the memory is available to do so
- * 
+ *
  * Revision 4.0.1.1  91/06/07  12:12:27  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:57:07  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #define VOIDUSED 1
diff --git a/gnu/usr.bin/perl/x2p/a2py.c b/gnu/usr.bin/perl/x2p/a2py.c
index 1558f9954f2e..fcc196b640f2 100644
--- a/gnu/usr.bin/perl/x2p/a2py.c
+++ b/gnu/usr.bin/perl/x2p/a2py.c
@@ -1,4 +1,4 @@
-/* $RCSfile: a2py.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $
+/* $RCSfile: a2py.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:53 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: a2py.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:53  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:10  nate
  * PERL!
  *
@@ -13,13 +16,13 @@
  * patch20: in a2p, now warns about spurious backslashes
  * patch20: in a2p, now allows [ to be backslashed in pattern
  * patch20: in a2p, now allows numbers of the form 2.
- * 
+ *
  * Revision 4.0.1.1  91/06/07  12:12:59  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:57:26  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #ifdef OS2
diff --git a/gnu/usr.bin/perl/x2p/handy.h b/gnu/usr.bin/perl/x2p/handy.h
index 85a777c2e7fb..1db94d4bfae2 100644
--- a/gnu/usr.bin/perl/x2p/handy.h
+++ b/gnu/usr.bin/perl/x2p/handy.h
@@ -1,4 +1,4 @@
-/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $
+/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,18 +6,21 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: handy.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:54  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:10  nate
  * PERL!
  *
  * Revision 4.0.1.2  91/06/07  12:15:43  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0.1.1  91/04/12  09:29:08  lwall
  * patch1: random cleanup in cpp namespace
- * 
+ *
  * Revision 4.0  91/03/20  01:57:45  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #define Null(type) ((type)0)
diff --git a/gnu/usr.bin/perl/x2p/hash.c b/gnu/usr.bin/perl/x2p/hash.c
index d525882f9acb..d1ae8ac44a56 100644
--- a/gnu/usr.bin/perl/x2p/hash.c
+++ b/gnu/usr.bin/perl/x2p/hash.c
@@ -1,4 +1,4 @@
-/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $
+/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: hash.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:54  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:10  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  12:15:55  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:57:49  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/perl/x2p/hash.h b/gnu/usr.bin/perl/x2p/hash.h
index ae4ffaff0617..452321cd557c 100644
--- a/gnu/usr.bin/perl/x2p/hash.h
+++ b/gnu/usr.bin/perl/x2p/hash.h
@@ -1,4 +1,4 @@
-/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $
+/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: hash.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:54  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:10  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  12:16:04  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:57:53  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #define FILLPCT 60		/* don't make greater than 99 */
diff --git a/gnu/usr.bin/perl/x2p/malloc.c b/gnu/usr.bin/perl/x2p/malloc.c
index dd43390d6dca..e7fff7f25c0f 100644
--- a/gnu/usr.bin/perl/x2p/malloc.c
+++ b/gnu/usr.bin/perl/x2p/malloc.c
@@ -1,6 +1,9 @@
-/* $RCSfile: malloc.c,v $$Revision: 1.2 $$Date: 1993/08/24 17:57:39 $
+/* $RCSfile: malloc.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $
  *
  * $Log: malloc.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:54  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.2  1993/08/24  17:57:39  nate
  * Fix for ALIGN macros in PERL that conflict with 4.4 macros
  *
@@ -11,19 +14,19 @@
  * patch20: removed implicit int declarations on functions
  * patch20: hash tables now split only if the memory is available to do so
  * patch20: realloc(0, size) now does malloc in case library routines call it
- * 
+ *
  * Revision 4.0.1.3  91/11/05  17:57:40  lwall
  * patch11: safe malloc code now integrated into Perl's malloc when possible
- * 
+ *
  * Revision 4.0.1.2  91/06/07  11:20:45  lwall
  * patch4: many, many itty-bitty portability fixes
- * 
+ *
  * Revision 4.0.1.1  91/04/11  17:48:31  lwall
  * patch1: Configure now figures out malloc ptr type
- * 
+ *
  * Revision 4.0  91/03/20  01:28:52  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #ifndef lint
@@ -37,12 +40,12 @@ static char sccsid[] = "@(#)malloc.c	4.3 (Berkeley) 9/16/83";
  * malloc.c (Caltech) 2/21/82
  * Chris Kingsley, kingsley@cit-20.
  *
- * This is a very fast storage allocator.  It allocates blocks of a small 
+ * This is a very fast storage allocator.  It allocates blocks of a small
  * number of different sizes, and keeps free lists of each size.  Blocks that
- * don't exactly fit are passed up to the next larger size.  In this 
+ * don't exactly fit are passed up to the next larger size.  In this
  * implementation, the available sizes are 2^n-4 (or 2^n-12) bytes long.
  * This is designed for use in a program that uses vast quantities of memory,
- * but bombs when it runs out. 
+ * but bombs when it runs out.
  */
 
 #include "EXTERN.h"
@@ -161,7 +164,7 @@ malloc(nbytes)
 	 * space used per block for accounting.
 	 */
   	nbytes += sizeof (union overhead) + RSLOP;
-  	nbytes = (nbytes + 3) &~ 3; 
+  	nbytes = (nbytes + 3) &~ 3;
   	shiftr = (nbytes - 1) >> 2;
 	/* apart from this loop, this is O(1) */
   	while (shiftr >>= 1)
@@ -170,7 +173,7 @@ malloc(nbytes)
 	 * If nothing in hash bucket right now,
 	 * request more memory from the system.
 	 */
-  	if (nextf[bucket] == NULL)    
+  	if (nextf[bucket] == NULL)
   		morecore(bucket);
   	if ((p = (union overhead *)nextf[bucket]) == NULL) {
 #ifdef safemalloc
@@ -256,7 +259,7 @@ morecore(bucket)
 	/* take 2k unless the block is bigger than that */
   	rnu = (bucket <= 8) ? 11 : bucket + 3;
 #else
-	/* take 16k unless the block is bigger than that 
+	/* take 16k unless the block is bigger than that
 	   (80286s like large segments!), probably good on the atari too */
   	rnu = (bucket <= 11) ? 14 : bucket + 3;
 #endif
@@ -294,7 +297,7 @@ morecore(bucket)
 void
 free(mp)
 	MALLOCPTRTYPE *mp;
-{   
+{
   	register MEM_SIZE size;
 	register union overhead *op;
 	char *cp = (char*)mp;
@@ -353,9 +356,9 @@ int reall_srchlen = 4;	/* 4 should be plenty, -1 =>'s whole list */
 
 MALLOCPTRTYPE *
 realloc(mp, nbytes)
-	MALLOCPTRTYPE *mp; 
+	MALLOCPTRTYPE *mp;
 	MEM_SIZE nbytes;
-{   
+{
   	register MEM_SIZE onb;
 	union overhead *op;
   	char *res;
@@ -419,7 +422,7 @@ realloc(mp, nbytes)
 			 * space used per block for accounting.
 			 */
 			nbytes += sizeof (union overhead) + RSLOP;
-			nbytes = (nbytes + 3) &~ 3; 
+			nbytes = (nbytes + 3) &~ 3;
 			op->ov_size = nbytes - 1;
 			*((u_int *)((caddr_t)op + nbytes - RSLOP)) = RMAGIC;
 		}
@@ -480,7 +483,7 @@ findbucket(freep, srchlen)
 #ifdef MSTATS
 /*
  * mstats - print out statistics about malloc
- * 
+ *
  * Prints two lines of numbers, one showing the length of the free list
  * for each size category, the second showing the number of mallocs -
  * frees for each size category.
diff --git a/gnu/usr.bin/perl/x2p/str.c b/gnu/usr.bin/perl/x2p/str.c
index 04611946e250..4e078a6600fe 100644
--- a/gnu/usr.bin/perl/x2p/str.c
+++ b/gnu/usr.bin/perl/x2p/str.c
@@ -1,4 +1,4 @@
-/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:09 $
+/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: str.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:54  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:09  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  12:20:08  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:58:15  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "handy.h"
@@ -215,7 +218,7 @@ str_new(len)
 int len;
 {
     register STR *str;
-    
+
     if (freestrroot) {
 	str = freestrroot;
 	freestrroot = str->str_link.str_next;
@@ -314,7 +317,7 @@ register FILE *fp;
 		    bp -= 2;
 		}
 	}
-	
+
 	fp->_cnt = cnt;			/* deregisterize cnt and ptr */
 	fp->_ptr = ptr;
 	i = _filbuf(fp);		/* get more characters */
diff --git a/gnu/usr.bin/perl/x2p/str.h b/gnu/usr.bin/perl/x2p/str.h
index 765d9ea2113d..642e18e66400 100644
--- a/gnu/usr.bin/perl/x2p/str.h
+++ b/gnu/usr.bin/perl/x2p/str.h
@@ -1,4 +1,4 @@
-/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $
+/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: str.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:55  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:10  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  12:20:22  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:58:21  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 struct string {
diff --git a/gnu/usr.bin/perl/x2p/util.c b/gnu/usr.bin/perl/x2p/util.c
index 4c5b078e4f9e..70a6cd7a647f 100644
--- a/gnu/usr.bin/perl/x2p/util.c
+++ b/gnu/usr.bin/perl/x2p/util.c
@@ -1,4 +1,4 @@
-/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $
+/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,15 +6,18 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: util.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:55  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:10  nate
  * PERL!
  *
  * Revision 4.0.1.1  91/06/07  12:20:35  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:58:25  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include <stdio.h>
@@ -103,7 +106,7 @@ register int len;
 {
     register char *dest = to;
 
-    if (from != Nullch) 
+    if (from != Nullch)
 	for (len--; len && (*dest++ = *from++); len--) ;
     *dest = '\0';
     return to;
@@ -234,7 +237,7 @@ char *nam, *val;
 #else
 	    char **tmpenv = Null(char **);
 #endif /* lint */
-    
+
 	    firstsetenv = FALSE;
 	    for (j=0; j<i; j++)		/* copy environment */
 		tmpenv[j] = environ[j];
diff --git a/gnu/usr.bin/perl/x2p/util.h b/gnu/usr.bin/perl/x2p/util.h
index 15bf78e53f33..ad94422bf32a 100644
--- a/gnu/usr.bin/perl/x2p/util.h
+++ b/gnu/usr.bin/perl/x2p/util.h
@@ -1,4 +1,4 @@
-/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $
+/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,18 +6,21 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: util.h,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:55  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:10  nate
  * PERL!
  *
  * Revision 4.0.1.2  91/11/05  19:21:20  lwall
  * patch11: various portability fixes
- * 
+ *
  * Revision 4.0.1.1  91/06/07  12:20:43  lwall
  * patch4: new copyright notice
- * 
+ *
  * Revision 4.0  91/03/20  01:58:29  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 /* is the string for makedir a directory name or a filename? */
diff --git a/gnu/usr.bin/perl/x2p/walk.c b/gnu/usr.bin/perl/x2p/walk.c
index 4cc4a79eb07b..c7e5e4445bf5 100644
--- a/gnu/usr.bin/perl/x2p/walk.c
+++ b/gnu/usr.bin/perl/x2p/walk.c
@@ -1,4 +1,4 @@
-/* $RCSfile: walk.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:11 $
+/* $RCSfile: walk.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $
  *
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: walk.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:55  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:30:11  nate
  * PERL!
  *
@@ -14,17 +17,17 @@
  * patch20: in a2p, made RS="" translate to $/ = "\n\n"
  * patch20: in a2p, do {...} while ... was missing some reconstruction code
  * patch20: in a2p, getline should allow variable to be array element
- * 
+ *
  * Revision 4.0.1.2  91/11/05  19:25:09  lwall
  * patch11: in a2p, split on whitespace produced extra null field
- * 
+ *
  * Revision 4.0.1.1  91/06/07  12:22:04  lwall
  * patch4: new copyright notice
  * patch4: a2p didn't correctly implement -n switch
- * 
+ *
  * Revision 4.0  91/03/20  01:58:36  lwall
  * 4.0 baseline.
- * 
+ *
  */
 
 #include "handy.h"
@@ -645,7 +648,7 @@ sub Pick {\n\
 	else
 	    tmpstr = str_make("");
 	sprintf(tokenbuf," = &Getline%d(%s)",len,tmpstr->str_ptr);
-	str_cat(str,tokenbuf); 
+	str_cat(str,tokenbuf);
 	str_free(tmpstr);
 	if (useval)
 	    str_cat(str,",$getline_ok)");