Re: Please hold, a pumpking will be with you shortly

--9jxsPFA5p3P2qPhR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sun, Aug 04, 2002 at 12:33:37PM -0700, Michael G Schwern wrote:
> Meanwhile, if Richard would like, he can maintain an unofficial repository
> so people have access to a working version to play with.  

Works for me so long as nobody swamps my dsl. Since we don't seem to
have diverged too much so far I'm fairly happy that I won't be
collating junk.

> The sources and patches I've been working from, including the hacked version
> I was using at YAPC, are here:
> http://www.pobox.com/~schwern/src/retroperl/perl1/

This is the commit that merges 1.0.14-modern to my version.  The
attached file, extra.patch, is the few things I've done differently
but intend to retain. (excluding the diff to Configure which is huge).

I seem to be out by a whole 9 lines, 4 of which (the setenv->PL_setenv
rename) come from my personal paranoia about conflicting symbols, and
2 from the OS X driven "where's sed" fix.

-- 
Richard Clamp <[email protected]>

--9jxsPFA5p3P2qPhR
Content-Type: message/rfc822
Content-Disposition: inline

Return-Path: <[email protected]>
Delivered-To: [email protected]
Received: from mirth.unixbeard.net (mirth [127.0.0.1])
	by mirth (Postfix) with ESMTP id 488394342
	for <commit>; Sun,  4 Aug 2002 23:12:21 +0100 (BST)
From: [email protected]
To: [email protected]
Subject: perl1 Makefile.SH,1.8,1.9 perly.c,1.5,1.6
Message-Id: <20020804221221.488394342@mirth>
Date: Sun,  4 Aug 2002 23:12:21 +0100 (BST)

Update of /home/richardc/cvs-repository/perl1
In directory mirth.unixbeard.net:/tmp/cvs-serv25550

Modified Files:
	Makefile.SH perly.c 
Log Message:
merge from Schwerns perl1.0.14-modern


Index: Makefile.SH
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/Makefile.SH,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.SH	4 Aug 2002 15:40:37 -0000	1.8
+++ Makefile.SH	4 Aug 2002 22:12:17 -0000	1.9
@@ -23,8 +23,8 @@
 # $Header$
 #
 # $Log$
-# Revision 1.8  2002/08/04 15:40:37  richardc
-# patch13
+# Revision 1.9  2002/08/04 22:12:17  richardc
+# merge from Schwerns perl1.0.14-modern
 #
 # Revision 1.0.1.5  88/02/02  11:20:49  root
 # patch13: added d_symlink dependency, changed TEST to ./perl TEST.
@@ -165,7 +165,7 @@
 
 test: perl
 	chmod 755 t/TEST t/base.* t/comp.* t/cmd.* t/io.* t/op.*
-	cd t && (rm -f perl; $(SLN) ../perl .) && ./TEST
+	cd t && (rm -f perl; $(SLN) ../perl .) && ./perl TEST
 
 clist:
 	echo $(c) | tr ' ' '\012' >.clist

Index: perly.c
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/perly.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- perly.c	4 Aug 2002 15:09:21 -0000	1.5
+++ perly.c	4 Aug 2002 22:12:17 -0000	1.6
@@ -1,8 +1,8 @@
 char rcsid[] = "$Header$";
 /*
  * $Log$
- * Revision 1.5  2002/08/04 15:09:21  richardc
- * use the sed that Configure found
+ * Revision 1.6  2002/08/04 22:12:17  richardc
+ * merge from Schwerns perl1.0.14-modern
  *
  * Revision 1.0.1.3  88/01/28  10:28:31  root
  * patch8: added eval operator.  Also fixed expectterm following right curly.
@@ -54,7 +54,7 @@
 #endif
 	case 'e':
 	    if (!e_fp) {
-		mktemp(e_tmpname);
+		mkstemp(e_tmpname);
 		e_fp = fopen(e_tmpname,"w");
 	    }
 	    if (argv[1])


--9jxsPFA5p3P2qPhR
Content-Type: message/rfc822
Content-Disposition: inline

Return-Path: <[email protected]>
Delivered-To: [email protected]
Received: from mirth.unixbeard.net (mirth [127.0.0.1])
	by mirth (Postfix) with ESMTP id 691EF4368
	for <commit>; Sun,  4 Aug 2002 23:12:21 +0100 (BST)
From: [email protected]
To: [email protected]
Subject: perl1/t TEST,1.3,1.4 op.flip,1.1,1.2 op.goto,1.1,1.2
Message-Id: <20020804221221.691EF4368@mirth>
Date: Sun,  4 Aug 2002 23:12:21 +0100 (BST)

Update of /home/richardc/cvs-repository/perl1/t
In directory mirth.unixbeard.net:/tmp/cvs-serv25550/t

Modified Files:
	TEST op.flip op.goto 
Log Message:
merge from Schwerns perl1.0.14-modern


Index: TEST
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/t/TEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TEST	4 Aug 2002 10:46:40 -0000	1.3
+++ TEST	4 Aug 2002 22:12:18 -0000	1.4
@@ -23,6 +23,8 @@
 }
 $bad = 0;
 while ($test = shift) {
+    next if $test =~ m/,v$/;
+    next if $test =~ m/~$/;
     print "$test...";
     if ($sharpbang) {
 	open(results,"./$test|") || (print "can't run.\n");

Index: op.flip
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/t/op.flip,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- op.flip	4 Aug 2002 10:29:42 -0000	1.1
+++ op.flip	4 Aug 2002 22:12:18 -0000	1.2
@@ -17,7 +17,7 @@
 
 @a = ('a','b','c','d','e','f','g');
 
-open(of,'/etc/termcap');
+open(of,'/etc/passwd');
 while (<of>) {
     (3 .. 5) && $foo .= $_;
 }

Index: op.goto
===================================================================
RCS file: /home/richardc/cvs-repository/perl1/t/op.goto,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- op.goto	4 Aug 2002 10:29:42 -0000	1.1
+++ op.goto	4 Aug 2002 22:12:18 -0000	1.2
@@ -30,5 +30,5 @@
 if ($foo == 4) {print "ok 2\n";} else {print "not ok 2\n";}
 
 $x = `./perl -e 'goto foo;' 2>&1`;
-print "#3\t/label/ in :$x";
+print "#3\t/label/ in :$x\n";
 if ($x =~ /label/) {print "ok 3\n";} else {print "not ok 3\n";}


--9jxsPFA5p3P2qPhR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="extra.patch"

diff -pur perl-1.0_14-modernized/Makefile.SH /home/richardc/lab/perl1/Makefile.SH
--- perl-1.0_14-modernized/Makefile.SH	2002-03-04 07:22:07.000000000 +0000
+++ /home/richardc/lab/perl1/Makefile.SH	2002-08-04 23:03:53.000000000 +0100
@@ -55,7 +55,7 @@ mallocsrc = $mallocsrc
 mallocobj = $mallocobj
 SLN = $sln
 
-libs = $libnm -lm
+libs = $libs $libnm -lm
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
diff -pur perl-1.0_14-modernized/form.c /home/richardc/lab/perl1/form.c
--- perl-1.0_14-modernized/form.c	1988-01-30 23:00:00.000000000 +0000
+++ /home/richardc/lab/perl1/form.c	2002-08-04 17:36:47.000000000 +0100
@@ -17,7 +17,7 @@
 #define CHKLEN(allow) \
 if (d - orec->o_str + (allow) >= curlen) { \
     curlen = d - orec->o_str; \
-    GROWSTR(&orec->o_str,&orec->o_len,orec->o_len + (allow)); \
+    GROWSTR(&orec->o_str,&orec->o_len,orec->o_len + (allow) + 1); \
     d = orec->o_str + curlen;	/* in case it moves */ \
     curlen = orec->o_len - 2; \
 }
diff -pur perl-1.0_14-modernized/perly.c /home/richardc/lab/perl1/perly.c
--- perl-1.0_14-modernized/perly.c	2002-03-04 07:22:29.000000000 +0000
+++ /home/richardc/lab/perl1/perly.c	2002-08-04 23:04:40.000000000 +0100
@@ -21,7 +21,7 @@ bool assume_p = FALSE;
 bool doswitches = FALSE;
 bool allstabs = FALSE;		/* init all customary symbols in symbol table?*/
 char *filename;
-char e_tmpname[17] = "/tmp/perl-eXXXXXX";
+char *e_tmpname = "/tmp/perl-eXXXXXX";
 FILE *e_fp = Nullfp;
 ARG *l();
 
@@ -120,7 +120,7 @@ register char **env;
 	argv[0] = "";
     if (preprocess) {
 	sprintf(buf, "\
-/bin/sed -e '/^[^#]/b' \
+%s -e '/^[^#]/b' \
  -e '/^#[ 	]*include[ 	]/b' \
  -e '/^#[ 	]*define[ 	]/b' \
  -e '/^#[ 	]*if[ 	]/b' \
@@ -129,7 +129,7 @@ register char **env;
  -e '/^#[ 	]*endif/b' \
  -e 's/^#.*//' \
  %s | %s -C %s%s",
-	  argv[0], CPP, str_get(str), CPPMINUS);
+	  SED, argv[0], CPP, str_get(str), CPPMINUS);
 	rsfp = popen(buf,"r");
     }
     else if (!*argv[0])
diff -pur perl-1.0_14-modernized/stab.c /home/richardc/lab/perl1/stab.c
--- perl-1.0_14-modernized/stab.c	2002-03-04 07:22:07.000000000 +0000
+++ /home/richardc/lab/perl1/stab.c	2002-08-04 17:15:28.000000000 +0100
@@ -244,7 +244,7 @@ STR *str;
 	}
     }
     else if (stab == envstab && envname) {
-	setenv(envname,str_get(str));
+	PL_setenv(envname,str_get(str));
 				/* And you'll never guess what the dog had */
 	safefree(envname);	/*   in its mouth... */
 	envname = Nullch;
diff -pur perl-1.0_14-modernized/t/TEST /home/richardc/lab/perl1/t/TEST
--- perl-1.0_14-modernized/t/TEST	2002-03-04 07:22:29.000000000 +0000
+++ /home/richardc/lab/perl1/t/TEST	2002-08-04 23:01:33.000000000 +0100
@@ -24,6 +24,7 @@ while (<config>) {
 $bad = 0;
 while ($test = shift) {
     next if $test =~ m/,v$/;
+    next if $test =~ m/~$/;
     print "$test...";
     if ($sharpbang) {
 	open(results,"./$test|") || (print "can't run.\n");
diff -pur perl-1.0_14-modernized/util.c /home/richardc/lab/perl1/util.c
--- perl-1.0_14-modernized/util.c	2002-03-04 07:22:01.000000000 +0000
+++ /home/richardc/lab/perl1/util.c	2002-08-04 17:15:29.000000000 +0100
@@ -223,7 +223,7 @@ static bool firstsetenv = TRUE;
 extern char **environ;
 
 void
-setenv(nam,val)
+PL_setenv(nam,val)
 char *nam, *val;
 {
     register int i=envix(nam);		/* where does it go? */
diff -pur perl-1.0_14-modernized/util.h /home/richardc/lab/perl1/util.h
--- perl-1.0_14-modernized/util.h	1988-01-30 23:00:00.000000000 +0000
+++ /home/richardc/lab/perl1/util.h	2002-08-04 17:15:29.000000000 +0100
@@ -28,7 +28,7 @@ void	prexit();
 char	*get_a_line();
 char	*savestr();
 int	makedir();
-void	setenv();
+void	PL_setenv();
 int	envix();
 void	notincl();
 char	*getval();

--9jxsPFA5p3P2qPhR--