undo changes that crash on (at least) the alpha

9 files changed, 27 insertions, 30 deletions

diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index f2517270e63..41a139a07d0 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.31 2001/11/11 01:19:23 espie Exp $
+#	$OpenBSD: Makefile,v 1.32 2001/11/11 06:02:05 deraadt Exp $
 
 PROG=	make
 CFLAGS+= -I${.OBJDIR} -I${.CURDIR}
@@ -19,7 +19,7 @@ SRCS=	arch.c buf.c cmd_exec.c compat.c cond.c dir.c error.c for.c \
 	var.c varmodifiers.c varname.c
 SRCS+=	lstAddNew.c lstAppend.c lstConcat.c lstConcatDestroy.c \
 	lstDeQueue.c lstDestroy.c lstDupl.c lstFindFrom.c lstForEachFrom.c \
-	lstInsert.c lstMember.c lstRemove.c lstReplace.c lstSucc.c
+	lstInit.c lstInsert.c lstMember.c lstRemove.c lstReplace.c lstSucc.c
 .PATH:	${.CURDIR}/lst.lib
 
 
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 09122273823..b3949586b92 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: dir.c,v 1.35 2001/11/11 01:19:23 espie Exp $ */
+/*	$OpenBSD: dir.c,v 1.36 2001/11/11 06:02:06 deraadt Exp $ */
 /*	$NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $	*/
 
 /*
@@ -320,7 +320,7 @@ Dir_Init()
 {
     char *dotname = ".";
 
-    Static_Lst_Init(dirSearchPath);
+    Lst_Init(dirSearchPath);
     ohash_init(&openDirectories, 4, &dir_info);
     ohash_init(&mtimes, 4, &stamp_info);
 
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index b3f9cc6d7ae..a4933e67dbb 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: job.c,v 1.44 2001/11/11 01:19:23 espie Exp $	*/
+/*	$OpenBSD: job.c,v 1.45 2001/11/11 06:02:06 deraadt Exp $	*/
 /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
 
 /*
@@ -2348,8 +2348,8 @@ Job_Init(maxproc, maxlocal)
     else
 	(void)close(tfd);
 
-    Static_Lst_Init(&jobs);
-    Static_Lst_Init(&stoppedJobs);
+    Lst_Init(&jobs);
+    Lst_Init(&stoppedJobs);
     maxJobs =	  maxproc;
     maxLocal =	  maxlocal;
     nJobs =	  0;
diff --git a/usr.bin/make/lowparse.c b/usr.bin/make/lowparse.c
index f5f627d9ae2..39260b9100f 100644
--- a/usr.bin/make/lowparse.c
+++ b/usr.bin/make/lowparse.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: lowparse.c,v 1.14 2001/11/11 01:19:23 espie Exp $ */
+/*	$OpenBSD: lowparse.c,v 1.15 2001/11/11 06:02:06 deraadt Exp $ */
 
 /* low-level parsing functions. */
 
@@ -443,7 +443,7 @@ Parse_Getfilename()
 void
 LowParse_Init()
 {
-    Static_Lst_Init(&input_stack);
+    Lst_Init(&input_stack);
     current = NULL;
 }
 
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index cbb1568a12b..a78be9add5b 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -2,7 +2,7 @@
 #define _LST_H_
 
 /*	$OpenPackages$ */
-/*	$OpenBSD: lst.h,v 1.22 2001/11/11 01:19:23 espie Exp $ */
+/*	$OpenBSD: lst.h,v 1.23 2001/11/11 06:02:06 deraadt Exp $ */
 /*	$NetBSD: lst.h,v 1.7 1996/11/06 17:59:12 christos Exp $ */
 
 /*
@@ -81,10 +81,7 @@ typedef void *(*DuplicateProc)(void *);
  * Creation/destruction functions
  */
 /* Create a new list */
-#define Lst_Init(l)	(l)->firstPtr = (l)->lastPtr = NULL
-/* Static lists are already okay */
-#define Static_Lst_Init(l)
-
+extern void		Lst_Init(LIST *);
 /* Duplicate an existing list */
 extern Lst		Lst_Clone(Lst, Lst, DuplicateProc);
 /* Destroy an old one */
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 1d0bfece596..94ac71e8f1e 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: main.c,v 1.54 2001/11/11 01:19:23 espie Exp $ */
+/*	$OpenBSD: main.c,v 1.55 2001/11/11 06:02:06 deraadt Exp $ */
 /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
 
 /*
@@ -587,10 +587,10 @@ main(argc, argv)
 	esetenv("PWD", objdir);
 	unsetenv("CDPATH");
 
-	Static_Lst_Init(create);
-	Static_Lst_Init(&makefiles);
-	Static_Lst_Init(&varstoprint);
-	Static_Lst_Init(&targs);
+	Lst_Init(create);
+	Lst_Init(&makefiles);
+	Lst_Init(&varstoprint);
+	Lst_Init(&targs);
 
 	beSilent = false;		/* Print commands as executed */
 	ignoreErrors = false;		/* Pay attention to non-zero returns */
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 35790607f4a..c0dfd5ff987 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: make.c,v 1.28 2001/11/11 01:19:23 espie Exp $	*/
+/*	$OpenBSD: make.c,v 1.29 2001/11/11 06:02:06 deraadt Exp $	*/
 /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
 
 /*
@@ -781,7 +781,7 @@ Make_Run(targs)
     LIST	    examine;	/* List of targets to examine */
     int 	    errors;	/* Number of errors the Job module reports */
 
-    Static_Lst_Init(&toBeMade);
+    Lst_Init(&toBeMade);
 
     Lst_Clone(&examine, targs, NOCOPY);
     numNodes = 0;
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index e600ae31dea..4cf8439eb44 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: parse.c,v 1.64 2001/11/11 01:19:23 espie Exp $	*/
+/*	$OpenBSD: parse.c,v 1.65 2001/11/11 06:02:06 deraadt Exp $	*/
 /*	$NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $	*/
 
 /*
@@ -1591,14 +1591,14 @@ void
 Parse_Init()
 {
     mainNode = NULL;
-    Static_Lst_Init(parseIncPath);
-    Static_Lst_Init(sysIncPath);
+    Lst_Init(parseIncPath);
+    Lst_Init(sysIncPath);
     Array_Init(&gsources, SOURCES_SIZE);
     Array_Init(&gtargets, TARGETS_SIZE);
     
     LowParse_Init();
 #ifdef CLEANUP
-    Static_Lst_Init(&targCmds);
+    Lst_Init(&targCmds);
 #endif
 }
 
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 59ad328601b..87b9ccdf9ba 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: suff.c,v 1.44 2001/11/11 01:19:23 espie Exp $ */
+/*	$OpenBSD: suff.c,v 1.45 2001/11/11 06:02:06 deraadt Exp $ */
 /*	$NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $	*/
 
 /*
@@ -1984,12 +1984,12 @@ Suff_SetNull(name)
 void
 Suff_Init()
 {
-    Static_Lst_Init(&sufflist);
+    Lst_Init(&sufflist);
 #ifdef CLEANUP
-    Static_Lst_Init(&suffClean);
+    Lst_Init(&suffClean);
 #endif
-    Static_Lst_Init(&srclist);
-    Static_Lst_Init(&transforms);
+    Lst_Init(&srclist);
+    Lst_Init(&transforms);
 
     sNum = 0;
     /*