 @@ -1,14 +1,14 @@
-/*	$NetBSD: arch.c,v 1.96 2020/08/23 18:59:01 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.97 2020/08/26 22:55:46 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.96 2020/08/23 18:59:01 rillig Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.97 2020/08/26 22:55:46 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: arch.c,v 1.96 2020/08/23 18:59:01 rillig Exp $");
+__RCSID("$NetBSD: arch.c,v 1.97 2020/08/26 22:55:46 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * arch.c --
  *	Functions to manipulate libraries, archives and their members.
+ *
  *	Once again, cacheing/hashing comes into play in the manipulation
  * of archives. The first time an archive is referenced, all of its members'
  * headers are read and hashed and the archive closed again. All hashed
  * archives are kept on a list which is searched each time an archive member
  * is referenced.
 @@ -381,27 +381,27 @@ Arch_ParseArchive(char **linePtr, Lst no
 	    } else if (Arch_ParseArchive(&sacrifice, nodeLst, ctxt)!=SUCCESS) {
 		/*
 		 * Error in nested call -- free buffer and return FAILURE
 		 * ourselves.
 		 */
 		free(buf);
 		return FAILURE;
+	    }
 	    /*
 	     * Free buffer and continue with our work.
 	     */
 	    free(buf);
 	} else if (Dir_HasWildcards(memName)) {
-	    Lst	  members = Lst_Init();
+	    Lst members = Lst_Init();
 	    Buffer nameBuf;
 	    Buf_Init(&nameBuf, 0);
 	    Dir_Expand(memName, dirSearchPath, members);
 	    while (!Lst_IsEmpty(members)) {
 		char *member = Lst_DequeueS(members);
 		Buf_Empty(&nameBuf);
 		Buf_AddStr(&nameBuf, libName);
 		Buf_AddStr(&nameBuf, "(");
 		Buf_AddStr(&nameBuf, member);
 		Buf_AddStr(&nameBuf, ")");
 		free(member);
 @@ -412,27 +412,27 @@ Arch_ParseArchive(char **linePtr, Lst no
 		    return FAILURE;
 		} else {
 		    /*
 		     * We've found the node, but have to make sure the rest of
 		     * the world knows it's an archive member, without having
 		     * to constantly check for parentheses, so we type the
 		     * thing with the OP_ARCHV bit before we place it on the
 		     * end of the provided list.
 		     */
 		    gn->type |= OP_ARCHV;
 		    Lst_AppendS(nodeLst, gn);
+		}
+	    }
-	    Lst_Destroy(members, NULL);
+	    Lst_FreeS(members);
 	    Buf_Destroy(&nameBuf, TRUE);
 	} else {
 	    Buffer nameBuf;
 	    Buf_Init(&nameBuf, 0);
 	    Buf_AddStr(&nameBuf, libName);
 	    Buf_AddStr(&nameBuf, "(");
 	    Buf_AddStr(&nameBuf, memName);
 	    Buf_AddStr(&nameBuf, ")");
 	    gn = Targ_FindNode(Buf_GetAll(&nameBuf, NULL), TARG_CREATE);
 	    Buf_Destroy(&nameBuf, TRUE);
 	    if (gn == NULL) {
 @@ -1278,65 +1278,39 @@ Arch_LibOODate(GNode *gn)
 	     */
 	    if (DEBUG(ARCH) || DEBUG(MAKE)) {
 		fprintf(debug_file, "No t.o.c....");
+	    }
 	    oodate = TRUE;
+	}
 #else
 	oodate = FALSE;
 #endif
+    }
     return oodate;
+}
-/*-
+/* Initialize things for this module. */
  *-----------------------------------------------------------------------
  * Arch_Init --
  *	Initialize things for this module.
  * Results:
  *	None.
  * Side Effects:
  *	The 'archives' list is initialized.
  *-----------------------------------------------------------------------
  */
 void
 Arch_Init(void)
+{
     archives = Lst_Init();
+}
 /* Clean up things for this module. */
 /*-
  *-----------------------------------------------------------------------
  * Arch_End --
  *	Cleanup things for this module.
  * Results:
  *	None.
  * Side Effects:
  *	The 'archives' list is freed
  *-----------------------------------------------------------------------
  */
 void
 Arch_End(void)
+{
 #ifdef CLEANUP
-    Lst_Destroy(archives, ArchFree);
+    Lst_DestroyS(archives, ArchFree);
 #endif
+}
 /*-
  *-----------------------------------------------------------------------
  * Arch_IsLib --
  *	Check if the node is a library
+ *
  * Results:
  *	True or False.
+ *
  * Side Effects:
  *	None.

 @@ -1,14 +1,14 @@
-/* $NetBSD: lst.c,v 1.41 2020/08/23 16:58:02 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.42 2020/08/26 22:55:46 rillig Exp $ */
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,31 +27,31 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <stdint.h>
 #include "make.h"
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lst.c,v 1.41 2020/08/23 16:58:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.42 2020/08/26 22:55:46 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.41 2020/08/23 16:58:02 rillig Exp $");
+__RCSID("$NetBSD: lst.c,v 1.42 2020/08/26 22:55:46 rillig Exp $");
 #endif /* not lint */
 #endif
 struct ListNode {
     struct ListNode *prev;	/* previous element in list */
     struct ListNode *next;	/* next in list */
     uint8_t useCount;		/* Count of functions using the node.
 				 * node may not be deleted until count
 				 * goes to 0 */
     Boolean deleted;		/* List node should be removed when done */
     union {
 	void *datum;		/* datum associated with this element */
 	const GNode *gnode;	/* alias, just for debugging */
 @@ -132,56 +132,58 @@ Lst_CopyS(Lst list, LstCopyProc copyProc
     assert(LstIsValid(list));
     newList = Lst_Init();
     for (node = list->first; node != NULL; node = node->next) {
 	void *datum = copyProc != NULL ? copyProc(node->datum) : node->datum;
 	Lst_AppendS(newList, datum);
+    }
     return newList;
+}
 /* Free a list and all its nodes. The list data itself are not freed though. */
 void
 Lst_FreeS(Lst list)
+{
     LstNode node;
     LstNode next;
     assert(LstIsValid(list));
     for (node = list->first; node != NULL; node = next) {
 	next = node->next;
 	free(node);
+    }
     free(list);
+}
 /* Destroy a list and free all its resources. If the freeProc is given, it is
  * called with the datum from each node in turn before the node is freed. */
 void
-Lst_Destroy(Lst list, LstFreeProc freeProc)
+Lst_DestroyS(Lst list, LstFreeProc freeProc)
+{
     LstNode node;
-    LstNode next = NULL;
+    LstNode next;
-    if (list == NULL)
+    assert(LstIsValid(list));
-	return;
+    assert(freeProc != NULL);
-    /* To ease scanning */
+    for (node = list->first; node != NULL; node = next) {
-    if (list->last != NULL)
+	next = node->next;
-	list->last->next = NULL;
+	freeProc(node->datum);
-    else {
+	free(node);
 	free(list);
 	return;
     if (freeProc) {
 	for (node = list->first; node != NULL; node = next) {
 	    next = node->next;
 	    freeProc(node->datum);
 	    free(node);
     } else {
 	for (node = list->first; node != NULL; node = next) {
 	    next = node->next;
 	    free(node);
+    }
     free(list);
+}
 /*
  * Functions to modify a list
  */
 /* Insert a new node with the given piece of data before the given node in the
  * given list. */
 void
 Lst_InsertBeforeS(Lst list, LstNode node, void *datum)
 @@ -330,49 +332,76 @@ LstNode_SetNullS(LstNode node)
 /* Return the first node from the given list, or NULL if the list is empty or
  * invalid. */
 LstNode
 Lst_First(Lst list)
+{
     if (!LstIsValid(list) || LstIsEmpty(list)) {
 	return NULL;
     } else {
 	return list->first;
+    }
+}
 /* Return the first node from the given list, or NULL if the list is empty. */
 LstNode
 Lst_FirstS(Lst list)
+{
     assert(LstIsValid(list));
     return list->first;
+}
 /* Return the last node from the given list, or NULL if the list is empty or
  * invalid. */
 LstNode
 Lst_Last(Lst list)
+{
     if (!LstIsValid(list) || LstIsEmpty(list)) {
 	return NULL;
     } else {
 	return list->last;
+    }
+}
 /* Return the last node from the given list, or NULL if the list is empty. */
 LstNode
 Lst_LastS(Lst list)
+{
     assert(LstIsValid(list));
     return list->last;
+}
 /* Return the successor to the given node on its list, or NULL. */
 LstNode
 Lst_Succ(LstNode node)
+{
     if (node == NULL) {
 	return NULL;
     } else {
 	return node->next;
+    }
+}
 /* Return the successor to the given node on its list, or NULL. */
 LstNode
 Lst_SuccS(LstNode node)
+{
     assert(LstNodeIsValid(node));
     return node->next;
+}
 /* Return the predecessor to the given node on its list, or NULL. */
 LstNode
 Lst_PrevS(LstNode node)
+{
     assert(LstNodeIsValid(node));
     return node->prev;
+}
 /* Return the datum stored in the given node. */
 void *
 Lst_DatumS(LstNode node)
+{
     assert(LstNodeIsValid(node));
 @@ -381,101 +410,153 @@ Lst_DatumS(LstNode node)
 /*
  * Functions for entire lists
  */
 /* Return TRUE if the given list is empty or invalid. */
 Boolean
 Lst_IsEmpty(Lst list)
+{
     return !LstIsValid(list) || LstIsEmpty(list);
+}
 /* Return TRUE if the given list is empty. */
 Boolean
 Lst_IsEmptyS(Lst list)
+{
     assert(LstIsValid(list));
     return LstIsEmpty(list);
+}
 /* Return the first node from the given list for which the given comparison
  * function returns 0, or NULL if none of the nodes matches. */
 LstNode
 Lst_Find(Lst list, LstFindProc cmp, const void *cmpData)
+{
     return Lst_FindFrom(list, Lst_First(list), cmp, cmpData);
+}
 /* Return the first node from the given list for which the given comparison
  * function returns 0, or NULL if none of the nodes matches. */
 LstNode
 Lst_FindS(Lst list, LstFindProc cmp, const void *cmpData)
+{
     if (LstIsEmpty(list))
 	return NULL;
     return Lst_FindFromS(list, Lst_FirstS(list), cmp, cmpData);
+}
 /* Return the first node from the given list, starting at the given node, for
  * which the given comparison function returns 0, or NULL if none of the nodes
  * matches. */
 LstNode
 Lst_FindFrom(Lst list, LstNode node, LstFindProc cmp, const void *cmpData)
+{
     LstNode tln;
     assert(cmp != NULL);
     if (!LstIsValid(list) || LstIsEmpty(list) || !LstNodeIsValid(node)) {
 	return NULL;
+    }
-    tln = node;
+    return Lst_FindFromS(list, node, cmp, cmpData);
+}
-    do {
+/* Return the first node from the given list, starting at the given node, for
  * which the given comparison function returns 0, or NULL if none of the nodes
  * matches. */
 LstNode
 Lst_FindFromS(Lst list, LstNode node, LstFindProc cmp, const void *cmpData)
+{
     LstNode tln;
     assert(LstIsValid(list));
     assert(LstNodeIsValid(node));
     assert(cmp != NULL);
     for (tln = node; tln != NULL; tln = tln->next) {
 	if (cmp(tln->datum, cmpData) == 0)
 	    return tln;
 	tln = tln->next;
     } while (tln != node && tln != NULL);
     return NULL;
+}
 /* Return the first node that contains the given datum, or NULL. */
 LstNode
 Lst_MemberS(Lst list, void *datum)
+{
     LstNode node;
     assert(LstIsValid(list));
     assert(datum != NULL);
     for (node = list->first; node != NULL; node = node->next) {
 	if (node->datum == datum) {
 	    return node;
+	}
+    }
     return NULL;
+}
 /* Apply the given function to each element of the given list. The function
  * should return 0 if traversal should continue and non-zero if it should
  * abort. */
 int
-Lst_ForEach(Lst list, int (*proc)(void *, void *), void *procData)
+Lst_ForEach(Lst list, LstActionProc proc, void *procData)
+{
     return Lst_ForEachFrom(list, Lst_First(list), proc, procData);
+}
 /* Apply the given function to each element of the given list. The function
  * should return 0 if traversal should continue and non-zero if it should
  * abort. */
 int
 Lst_ForEachS(Lst list, LstActionProc proc, void *procData)
+{
     if (LstIsEmpty(list))
 	return 0;		/* XXX: Document what this value means. */
     return Lst_ForEachFromS(list, Lst_First(list), proc, procData);
+}
 /* Apply the given function to each element of the given list, starting from
  * the given node. The function should return 0 if traversal should continue,
  * and non-zero if it should abort. */
 int
 Lst_ForEachFrom(Lst list, LstNode node,
-		int (*proc)(void *, void *), void *procData)
+		LstActionProc proc, void *procData)
+{
     if (!LstIsValid(list) || LstIsEmpty(list)) {
 	return 0;
+    }
     return Lst_ForEachFromS(list, node, proc, procData);
+}
 /* Apply the given function to each element of the given list, starting from
  * the given node. The function should return 0 if traversal should continue,
  * and non-zero if it should abort. */
 int
 Lst_ForEachFromS(Lst list, LstNode node,
 		 LstActionProc proc, void *procData)
+{
     LstNode tln = node;
     LstNode next;
     Boolean done;
     int result;
-    if (!LstIsValid(list) || LstIsEmpty(list)) {
+    assert(LstIsValid(list));
-	return 0;
+    assert(LstNodeIsValid(node));
     assert(proc != NULL);
     do {
 	/*
 	 * Take care of having the current element deleted out from under
 	 * us.
 	 */
 	next = tln->next;
 	/*
 	 * We're done with the traversal if
 	 *  - the next node to examine doesn't exist and
 	 *  - nothing's been added after the current node (check this

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.313 2020/08/25 16:50:02 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.314 2020/08/26 22:55:46 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,39 +59,39 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.313 2020/08/25 16:50:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.314 2020/08/26 22:55:46 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.313 2020/08/25 16:50:02 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.314 2020/08/26 22:55:46 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * main.c --
  *	The main file for this entire program. Exit routines etc
  *	reside here.
+ *
  * Utility functions defined in this file:
  *	Main_ParseArgLine	Takes a line of arguments, breaks them and
  *				treats them as if they were given when first
  *				invoked. Used by the parse module to implement
 @@ -895,27 +895,27 @@ doPrintVars(void)
 static Boolean
 runTargets(void)
+{
 	Lst targs;	/* target nodes to create -- passed to Make_Init */
 	Boolean outOfDate; 	/* FALSE if all targets up to date */
 	/*
 	 * Have now read the entire graph and need to make a list of
 	 * targets to create. If none was given on the command line,
 	 * we consult the parsing module to find the main target(s)
 	 * to create.
 	 */
-	if (Lst_IsEmpty(create))
+	if (Lst_IsEmptyS(create))
 		targs = Parse_MainName();
 	else
 		targs = Targ_FindList(create, TARG_CREATE);
 	if (!compatMake) {
 		/*
 		 * Initialize job module before traversing the graph
 		 * now that any .BEGIN and .END targets have been read.
 		 * This is done only if the -q flag wasn't given
 		 * (to prevent the .BEGIN from being executed should
 		 * it exist).
 		 */
 		if (!queryFlag) {
 @@ -923,27 +923,27 @@ runTargets(void)
 			jobsRunning = TRUE;
+		}
 		/* Traverse the graph, checking on all the targets */
 		outOfDate = Make_Run(targs);
 	} else {
 		/*
 		 * Compat_Init will take care of creating all the
 		 * targets as well as initializing the module.
 		 */
 		Compat_Run(targs);
 		outOfDate = FALSE;
+	}
-	Lst_Destroy(targs, NULL);
+	Lst_FreeS(targs);
 	return outOfDate;
+}
 /*-
  * main --
  *	The main function, for obvious reasons. Initializes variables
  *	and a few modules, then parses the arguments give it in the
  *	environment and on the command line. Reads the system makefile
  *	followed by either Makefile, makefile or the file given by the
  *	-f argument. Sets the .MAKEFLAGS PMake variable based on all the
  *	flags it has received by then uses either the Make or the Compat
  *	module to create the initial list of targets.
+ *
 @@ -1457,29 +1457,29 @@ main(int argc, char **argv)
 	/* print the initial graph, if the user requested it */
 	if (DEBUG(GRAPH1))
 		Targ_PrintGraph(1);
 	/* print the values of any variables requested by the user */
 	if (printVars) {
 		doPrintVars();
 		outOfDate = FALSE;
 	} else {
 		outOfDate = runTargets();
+	}
 #ifdef CLEANUP
-	Lst_Destroy(variables, NULL);
+	Lst_FreeS(variables);
-	Lst_Destroy(makefiles, NULL);
+	Lst_FreeS(makefiles);
-	Lst_Destroy(create, free);
+	Lst_DestroyS(create, free);
 #endif
 	/* print the graph now it's been processed if the user requested it */
 	if (DEBUG(GRAPH2))
 		Targ_PrintGraph(2);
 	Trace_Log(MAKEEND, 0);
 	if (enterFlagObj)
 		printf("%s: Leaving directory `%s'\n", progname, objdir);
 	if (enterFlag)
 		printf("%s: Leaving directory `%s'\n", progname, curdir);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.c,v 1.123 2020/08/25 16:27:24 rillig Exp $	*/
+/*	$NetBSD: make.c,v 1.124 2020/08/26 22:55:46 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: make.c,v 1.123 2020/08/25 16:27:24 rillig Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.124 2020/08/26 22:55:46 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: make.c,v 1.123 2020/08/25 16:27:24 rillig Exp $");
+__RCSID("$NetBSD: make.c,v 1.124 2020/08/26 22:55:46 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * make.c --
  *	The functions which perform the examination of targets and
  *	their suitability for creation
+ *
  * Interface:
  *	Make_Run 	    	Initialize things for the module and recreate
  *	    	  	    	whatever needs recreating. Returns TRUE if
  *	    	    	    	work was (or would have been) done and FALSE
 @@ -1296,27 +1296,27 @@ Make_ExpandUse(Lst targs)
     GNode  *gn;		/* a temporary pointer */
     Lst    examine; 	/* List of targets to examine */
     examine = Lst_CopyS(targs, NULL);
     /*
      * Make an initial downward pass over the graph, marking nodes to be made
      * as we go down. We call Suff_FindDeps to find where a node is and
      * to get some children for it if it has none and also has no commands.
      * If the node is a leaf, we stick it on the toBeMade queue to
      * be looked at in a minute, otherwise we add its children to our queue
      * and go on about our business.
      */
-    while (!Lst_IsEmpty(examine)) {
+    while (!Lst_IsEmptyS(examine)) {
 	gn = Lst_DequeueS(examine);
 	if (gn->flags & REMAKE)
 	    /* We've looked at this one already */
 	    continue;
 	gn->flags |= REMAKE;
 	if (DEBUG(MAKE))
 	    fprintf(debug_file, "Make_ExpandUse: examine %s%s\n",
 		    gn->name, gn->cohort_num);
 	if (gn->type & OP_DOUBLEDEP)
 	    Lst_PrependAllS(examine, gn->cohorts);
 @@ -1349,27 +1349,27 @@ Make_ExpandUse(Lst targs)
 	    Suff_FindDeps(gn);
 	else {
 	    /* Pretend we made all this node's children */
 	    Lst_ForEach(gn->children, MakeFindChild, gn);
 	    if (gn->unmade != 0)
 		    printf("Warning: %s%s still has %d unmade children\n",
 			    gn->name, gn->cohort_num, gn->unmade);
+	}
 	if (gn->unmade != 0)
 	    Lst_ForEach(gn->children, MakeAddChild, examine);
+    }
-    Lst_Destroy(examine, NULL);
+    Lst_FreeS(examine);
+}
 /*-
  *-----------------------------------------------------------------------
  * Make_ProcessWait --
  *	Convert .WAIT nodes into dependencies
+ *
  * Input:
  *	targs		the initial list of targets
+ *
  *-----------------------------------------------------------------------
  */
 @@ -1455,27 +1455,27 @@ Make_ProcessWait(Lst targs)
 	for (; (ln = Lst_NextS(pgn->children)) != NULL; ) {
 	    cgn = Lst_DatumS(ln);
 	    if (cgn->type & OP_WAIT) {
 		/* Make the .WAIT node depend on the previous children */
 		Lst_ForEachFrom(pgn->children, owln, add_wait_dep, cgn);
 		owln = ln;
 	    } else {
 		Lst_AppendS(examine, cgn);
+	    }
+	}
 	Lst_CloseS(pgn->children);
+    }
-    Lst_Destroy(examine, NULL);
+    Lst_FreeS(examine);
+}
 /*-
  *-----------------------------------------------------------------------
  * Make_Run --
  *	Initialize the nodes to remake and the list of nodes which are
  *	ready to be made by doing a breadth-first traversal of the graph
  *	starting from the nodes in the given list. Once this traversal
  *	is finished, all the 'leaves' of the graph are in the toBeMade
  *	queue.
  *	Using this queue and the Job module, work back up the graph,
  *	calling on MakeStartJobs to keep the job table as full as
  *	possible.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.262 2020/08/25 16:50:02 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.263 2020/08/26 22:55:46 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.262 2020/08/25 16:50:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.263 2020/08/26 22:55:46 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.262 2020/08/25 16:50:02 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.263 2020/08/26 22:55:46 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * parse.c --
  *	Functions to parse a makefile.
+ *
  *	One function, Parse_Init, must be called before any functions
  *	in this module are used. After that, the function Parse_File is the
  *	main entry point and controls most of the other functions in this
  *	module.
+ *
 @@ -843,27 +843,27 @@ ParseMessage(char *line)
  * Side Effects:
  *	New elements are added to the parents list of cgn and the
  *	children list of cgn. the unmade field of pgn is updated
  *	to reflect the additional child.
  *---------------------------------------------------------------------
  */
 static int
 ParseLinkSrc(void *pgnp, void *cgnp)
+{
     GNode          *pgn = (GNode *)pgnp;
     GNode          *cgn = (GNode *)cgnp;
     if ((pgn->type & OP_DOUBLEDEP) && !Lst_IsEmpty(pgn->cohorts))
-	pgn = Lst_DatumS(Lst_Last(pgn->cohorts));
+	pgn = Lst_DatumS(Lst_LastS(pgn->cohorts));
     Lst_AppendS(pgn->children, cgn);
     if (specType == Not)
 	Lst_AppendS(cgn->parents, pgn);
     pgn->unmade += 1;
     if (DEBUG(PARSE)) {
 	fprintf(debug_file, "# %s: added child %s - %s\n", __func__,
 	    pgn->name, cgn->name);
 	Targ_PrintNode(pgn, 0);
 	Targ_PrintNode(cgn, 0);
+    }
     return 0;
+}
 @@ -1423,27 +1423,27 @@ ParseDoDependency(char *line)
 	 */
 	if (specType == Not && *line != '\0') {
 	    if (Dir_HasWildcards(line)) {
 		/*
 		 * Targets are to be sought only in the current directory,
 		 * so create an empty path for the thing. Note we need to
 		 * use Dir_Destroy in the destruction of the path as the
 		 * Dir module could have added a directory to the path...
 		 */
 		Lst	    emptyPath = Lst_Init();
 		Dir_Expand(line, emptyPath, curTargs);
-		Lst_Destroy(emptyPath, Dir_Destroy);
+		Lst_DestroyS(emptyPath, Dir_Destroy);
 	    } else {
 		/*
 		 * No wildcards, but we want to avoid code duplication,
 		 * so create a list with the word on it.
 		 */
 		Lst_AppendS(curTargs, line);
+	    }
 	    /* Apply the targets. */
 	    while(!Lst_IsEmpty(curTargs)) {
 		char *targName = Lst_DequeueS(curTargs);
 @@ -1484,27 +1484,27 @@ ParseDoDependency(char *line)
+	    }
 	} else {
 	    while (*cp && isspace ((unsigned char)*cp)) {
 		cp++;
+	    }
+	}
 	line = cp;
     } while (*line && (ParseIsEscaped(lstart, line) ||
 	(*line != '!' && *line != ':')));
     /*
      * Don't need the list of target names anymore...
      */
-    Lst_Destroy(curTargs, NULL);
+    Lst_FreeS(curTargs);
     curTargs = NULL;
     if (!Lst_IsEmpty(targets)) {
 	switch(specType) {
 	    default:
 		Parse_Error(PARSE_WARNING, "Special and mundane targets don't mix. Mundane ones ignored");
 		break;
 	    case Default:
 	    case Stale:
 	    case Begin:
 	    case End:
 	    case dotError:
 	    case Interrupt:
 @@ -1676,27 +1676,27 @@ ParseDoDependency(char *line)
 		default:
 		    break;
+	    }
 	    *cp = savec;
 	    if (savec != '\0') {
 		cp++;
+	    }
 	    while (*cp && isspace ((unsigned char)*cp)) {
 		cp++;
+	    }
 	    line = cp;
+	}
 	if (paths) {
-	    Lst_Destroy(paths, NULL);
+	    Lst_FreeS(paths);
 	    paths = NULL;
+	}
 	if (specType == ExPath)
 	    Dir_SetPATH();
     } else {
 	assert(paths == NULL);
 	while (*line) {
 	    /*
 	     * The targets take real sources, so we must beware of archive
 	     * specifications (i.e. things with left parentheses in them)
 	     * and handle them accordingly.
 	     */
 	    for (; *cp && !isspace ((unsigned char)*cp); cp++) {
 @@ -1713,27 +1713,27 @@ ParseDoDependency(char *line)
 	    if (*cp == LPAREN) {
 		sources = Lst_Init();
 		if (Arch_ParseArchive(&line, sources, VAR_CMD) != SUCCESS) {
 		    Parse_Error(PARSE_FATAL,
 				 "Error in source archive spec \"%s\"", line);
 		    goto out;
+		}
 		while (!Lst_IsEmpty(sources)) {
 		    gn = Lst_DequeueS(sources);
 		    ParseDoSrc(tOp, gn->name);
+		}
-		Lst_Destroy(sources, NULL);
+		Lst_FreeS(sources);
 		cp = line;
 	    } else {
 		if (*cp) {
 		    *cp = '\0';
 		    cp += 1;
+		}
 		ParseDoSrc(tOp, line);
+	    }
 	    while (*cp && isspace ((unsigned char)*cp)) {
 		cp++;
+	    }
 	    line = cp;
 @@ -1741,30 +1741,30 @@ ParseDoDependency(char *line)
+    }
     if (mainNode == NULL) {
 	/*
 	 * If we have yet to decide on a main target to make, in the
 	 * absence of any user input, we want the first target on
 	 * the first dependency line that is actually a real target
 	 * (i.e. isn't a .USE or .EXEC rule) to be made.
 	 */
 	Lst_ForEach(targets, ParseFindMain, NULL);
+    }
 out:
-    if (paths)
+    if (paths != NULL)
-	Lst_Destroy(paths, NULL);
+	Lst_FreeS(paths);
-    if (curTargs)
+    if (curTargs != NULL)
-	    Lst_Destroy(curTargs, NULL);
+	Lst_FreeS(curTargs);
+}
 /*-
  *---------------------------------------------------------------------
  * Parse_IsVar  --
  *	Return TRUE if the passed line is a variable assignment. A variable
  *	assignment consists of a single word followed by optional whitespace
  *	followed by either a += or an = operator.
  *	This function is used both by the Parse_File function and main when
  *	parsing the command-line arguments.
+ *
  * Input:
  *	line		the line to check
 @@ -3008,28 +3008,30 @@ ParseReadLine(void)
+ *
  * Results:
  *	Nothing.
+ *
  * Side Effects:
  *	inLine set FALSE. 'targets' list destroyed.
+ *
  *-----------------------------------------------------------------------
  */
 static void
 ParseFinishLine(void)
+{
     if (inLine) {
-	Lst_ForEach(targets, Suff_EndTransform, NULL);
+        if (targets != NULL) {
-	Lst_Destroy(targets, ParseHasCommands);
+	    Lst_ForEach(targets, Suff_EndTransform, NULL);
 	    Lst_DestroyS(targets, ParseHasCommands);
+	}
 	targets = NULL;
 	inLine = FALSE;
+    }
+}
 /*-
  *---------------------------------------------------------------------
  * Parse_File --
  *	Parse a file into its component parts, incorporating it into the
  *	current dependency graph. This is the main function and controls
  *	almost every other function in this module
+ *
 @@ -3227,28 +3229,28 @@ Parse_File(const char *name, int fd)
 	    else
 		cp = NULL;
 	    /*
 	     * We now know it's a dependency line so it needs to have all
 	     * variables expanded before being parsed. Tell the variable
 	     * module to complain if some variable is undefined...
 	     */
 	    line = Var_Subst(line, VAR_CMD, VARE_UNDEFERR|VARE_WANTRES);
 	    /*
 	     * Need a non-circular list for the target nodes
 	     */
-	    if (targets)
+	    if (targets != NULL)
-		Lst_Destroy(targets, NULL);
+		Lst_FreeS(targets);
 	    targets = Lst_Init();
 	    inLine = TRUE;
 	    ParseDoDependency(line);
 	    free(line);
 	    /* If there were commands after a ';', add them now */
 	    if (cp != NULL) {
 		goto shellCommand;
+	    }
+	}
 	/*
 @@ -3285,33 +3287,33 @@ Parse_Init(void)
     parseIncPath = Lst_Init();
     sysIncPath = Lst_Init();
     defIncPath = Lst_Init();
     includes = Lst_Init();
 #ifdef CLEANUP
     targCmds = Lst_Init();
 #endif
+}
 void
 Parse_End(void)
+{
 #ifdef CLEANUP
-    Lst_Destroy(targCmds, free);
+    Lst_DestroyS(targCmds, free);
     if (targets)
-	Lst_Destroy(targets, NULL);
+	Lst_FreeS(targets);
-    Lst_Destroy(defIncPath, Dir_Destroy);
+    Lst_DestroyS(defIncPath, Dir_Destroy);
-    Lst_Destroy(sysIncPath, Dir_Destroy);
+    Lst_DestroyS(sysIncPath, Dir_Destroy);
-    Lst_Destroy(parseIncPath, Dir_Destroy);
+    Lst_DestroyS(parseIncPath, Dir_Destroy);
-    Lst_Destroy(includes, NULL);	/* Should be empty now */
+    Lst_FreeS(includes);	/* Should be empty now */
 #endif
+}
 /*-
  *-----------------------------------------------------------------------
  * Parse_MainName --
  *	Return a Lst of the main target to create for main()'s sake. If
  *	no such target exists, we Punt with an obnoxious error message.
+ *
  * Results:
  *	A Lst of the single node to create.
+ *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.115 2020/08/25 16:50:02 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.116 2020/08/26 22:55:46 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.115 2020/08/25 16:50:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.116 2020/08/26 22:55:46 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.115 2020/08/25 16:50:02 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.116 2020/08/26 22:55:46 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * suff.c --
  *	Functions to maintain suffix lists and find implicit dependents
  *	using suffix transformation rules
+ *
  * Interface:
  *	Suff_Init 	    	Initialize all things to do with suffixes.
+ *
  *	Suff_End 	    	Cleanup the module
 @@ -431,30 +431,30 @@ SuffFree(void *sp)
     if (s == suffNull)
 	suffNull = NULL;
     if (s == emptySuff)
 	emptySuff = NULL;
 #ifdef notdef
     /* We don't delete suffixes in order, so we cannot use this */
     if (s->refCount)
 	Punt("Internal error deleting suffix `%s' with refcount = %d", s->name,
 	    s->refCount);
 #endif
-    Lst_Destroy(s->ref, NULL);
+    Lst_FreeS(s->ref);
-    Lst_Destroy(s->children, NULL);
+    Lst_FreeS(s->children);
-    Lst_Destroy(s->parents, NULL);
+    Lst_FreeS(s->parents);
-    Lst_Destroy(s->searchPath, Dir_Destroy);
+    Lst_DestroyS(s->searchPath, Dir_Destroy);
     free(s->name);
     free(s);
+}
 /*-
  *-----------------------------------------------------------------------
  * SuffRemove  --
  *	Remove the suffix into the list
+ *
  * Results:
  *	None
+ *
 @@ -599,27 +599,27 @@ SuffParseTransform(char *str, Suff **src
 				     * null suffix */
     srcLn = NULL;
     singleLn = NULL;
     /*
      * Loop looking first for a suffix that matches the start of the
      * string and then for one that exactly matches the rest of it. If
      * we can find two that meet these criteria, we've successfully
      * parsed the string.
      */
     for (;;) {
 	if (srcLn == NULL) {
-	    srcLn = Lst_Find(sufflist, SuffSuffIsPrefix, str);
+	    srcLn = Lst_FindS(sufflist, SuffSuffIsPrefix, str);
 	} else {
 	    srcLn = Lst_FindFrom(sufflist, Lst_Succ(srcLn),
 				 SuffSuffIsPrefix, str);
+	}
 	if (srcLn == NULL) {
 	    /*
 	     * Ran out of source suffixes -- no such rule
 	     */
 	    if (singleLn != NULL) {
 		/*
 		 * Not so fast Mr. Smith! There was a suffix that encompassed
 		 * the entire string, so we assume it was a transformation
 		 * to the null suffix (thank you POSIX). We still prefer to
 @@ -630,27 +630,27 @@ SuffParseTransform(char *str, Suff **src
 		 */
 		*srcPtr = single;
 		*targPtr = suffNull;
 		return TRUE;
+	    }
 	    return FALSE;
+	}
 	src = Lst_DatumS(srcLn);
 	str2 = str + src->nameLen;
 	if (*str2 == '\0') {
 	    single = src;
 	    singleLn = srcLn;
 	} else {
-	    targLn = Lst_Find(sufflist, SuffSuffHasNameP, str2);
+	    targLn = Lst_FindS(sufflist, SuffSuffHasNameP, str2);
 	    if (targLn != NULL) {
 		*srcPtr = src;
 		*targPtr = Lst_DatumS(targLn);
 		return TRUE;
+	    }
+	}
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_IsTransform  --
  *	Return TRUE if the given string is a transformation rule
 @@ -706,28 +706,28 @@ Suff_AddTransform(char *line)
 	 * Make a new graph node for the transformation. It will be filled in
 	 * by the Parse module.
 	 */
 	gn = Targ_NewGN(line);
 	Lst_AppendS(transforms, gn);
     } else {
 	/*
 	 * New specification for transformation rule. Just nuke the old list
 	 * of commands so they can be filled in again... We don't actually
 	 * free the commands themselves, because a given command can be
 	 * attached to several different transformations.
 	 */
 	gn = Lst_DatumS(ln);
-	Lst_Destroy(gn->commands, NULL);
+	Lst_FreeS(gn->commands);
-	Lst_Destroy(gn->children, NULL);
+	Lst_FreeS(gn->children);
 	gn->commands = Lst_Init();
 	gn->children = Lst_Init();
+    }
     gn->type = OP_TRANSFORM;
     (void)SuffParseTransform(line, &s, &t);
     /*
      * link the two together in the proper relationship and order
      */
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "defining transformation from `%s' to `%s'\n",
 @@ -839,51 +839,51 @@ SuffRebuildGraph(void *transformp, void
+{
     GNode   	*transform = (GNode *)transformp;
     Suff    	*s = (Suff *)sp;
     char 	*cp;
     LstNode	ln;
     Suff  	*s2;
     SuffixCmpData sd;
     /*
      * First see if it is a transformation from this suffix.
      */
     cp = UNCONST(SuffStrIsPrefix(s->name, transform->name));
     if (cp != NULL) {
-	ln = Lst_Find(sufflist, SuffSuffHasNameP, cp);
+	ln = Lst_FindS(sufflist, SuffSuffHasNameP, cp);
 	if (ln != NULL) {
 	    /*
 	     * Found target. Link in and return, since it can't be anything
 	     * else.
 	     */
 	    s2 = Lst_DatumS(ln);
 	    SuffInsert(s2->children, s);
 	    SuffInsert(s->parents, s2);
 	    return 0;
+	}
+    }
     /*
      * Not from, maybe to?
      */
     sd.len = strlen(transform->name);
     sd.ename = transform->name + sd.len;
     cp = SuffSuffIsSuffix(s, &sd);
     if (cp != NULL) {
 	/*
 	 * Null-terminate the source suffix in order to find it.
 	 */
 	cp[1] = '\0';
-	ln = Lst_Find(sufflist, SuffSuffHasNameP, transform->name);
+	ln = Lst_FindS(sufflist, SuffSuffHasNameP, transform->name);
 	/*
 	 * Replace the start of the target suffix
 	 */
 	cp[1] = s->name[0];
 	if (ln != NULL) {
 	    /*
 	     * Found it -- establish the proper relationship
 	     */
 	    s2 = Lst_DatumS(ln);
 	    SuffInsert(s->children, s2);
 	    SuffInsert(s2->parents, s);
+	}
+    }
 @@ -924,27 +924,27 @@ SuffScanTargets(void *targetp, void *gsp
     if (target->type == OP_TRANSFORM)
 	return 0;
     if ((ptr = strstr(target->name, gs->s->name)) == NULL ||
 	ptr == target->name)
 	return 0;
     if (SuffParseTransform(target->name, &s, &t)) {
 	if (*gs->gn == target) {
 	    gs->r = TRUE;
 	    *gs->gn = NULL;
 	    Targ_SetMain(NULL);
+	}
-	Lst_Destroy(target->children, NULL);
+	Lst_FreeS(target->children);
 	target->children = Lst_Init();
 	target->type = OP_TRANSFORM;
 	/*
 	 * link the two together in the proper relationship and order
 	 */
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "defining transformation from `%s' to `%s'\n",
 		s->name, t->name);
+	}
 	SuffInsert(t->children, s);
 	SuffInsert(s->parents, t);
+    }
     return 0;
 @@ -966,27 +966,27 @@ SuffScanTargets(void *targetp, void *gsp
  *	A GNode is created for the suffix and a Suff structure is created and
  *	added to the suffixes list unless the suffix was already known.
  *	The mainNode passed can be modified if a target mutated into a
  *	transform and that target happened to be the main target.
  *-----------------------------------------------------------------------
  */
 void
 Suff_AddSuffix(char *str, GNode **gn)
+{
     Suff          *s;	    /* new suffix descriptor */
     LstNode 	  ln;
     GNodeSuff	  gs;
-    ln = Lst_Find(sufflist, SuffSuffHasNameP, str);
+    ln = Lst_FindS(sufflist, SuffSuffHasNameP, str);
     if (ln == NULL) {
 	s = bmake_malloc(sizeof(Suff));
 	s->name =   	bmake_strdup(str);
 	s->nameLen = 	strlen(s->name);
 	s->searchPath = Lst_Init();
 	s->children = 	Lst_Init();
 	s->parents = 	Lst_Init();
 	s->ref = 	Lst_Init();
 	s->sNum =   	sNum++;
 	s->flags =  	0;
 	s->refCount =	1;
 @@ -1018,27 +1018,27 @@ Suff_AddSuffix(char *str, GNode **gn)
  *	The searchPath for the desired suffix or NULL if the suffix isn't
  *	defined.
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 Lst
 Suff_GetPath(char *sname)
+{
     LstNode   	  ln;
     Suff    	  *s;
-    ln = Lst_Find(sufflist, SuffSuffHasNameP, sname);
+    ln = Lst_FindS(sufflist, SuffSuffHasNameP, sname);
     if (ln == NULL) {
 	return NULL;
     } else {
 	s = Lst_DatumS(ln);
 	return s->searchPath;
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_DoPaths --
  *	Extend the search paths for all suffixes to include the default
  *	search path.
 @@ -1074,66 +1074,66 @@ Suff_DoPaths(void)
 	if (!Lst_IsEmpty (s->searchPath)) {
 #ifdef INCLUDES
 	    if (s->flags & SUFF_INCLUDE) {
 		Dir_Concat(inIncludes, s->searchPath);
+	    }
 #endif /* INCLUDES */
 #ifdef LIBRARIES
 	    if (s->flags & SUFF_LIBRARY) {
 		Dir_Concat(inLibs, s->searchPath);
+	    }
 #endif /* LIBRARIES */
 	    Dir_Concat(s->searchPath, dirSearchPath);
 	} else {
-	    Lst_Destroy(s->searchPath, Dir_Destroy);
+	    Lst_DestroyS(s->searchPath, Dir_Destroy);
 	    s->searchPath = Lst_CopyS(dirSearchPath, Dir_CopyDir);
+	}
+    }
     Lst_CloseS(sufflist);
     Var_Set(".INCLUDES", ptr = Dir_MakeFlags("-I", inIncludes), VAR_GLOBAL);
     free(ptr);
     Var_Set(".LIBS", ptr = Dir_MakeFlags("-L", inLibs), VAR_GLOBAL);
     free(ptr);
-    Lst_Destroy(inIncludes, Dir_Destroy);
+    Lst_DestroyS(inIncludes, Dir_Destroy);
-    Lst_Destroy(inLibs, Dir_Destroy);
+    Lst_DestroyS(inLibs, Dir_Destroy);
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_AddInclude --
  *	Add the given suffix as a type of file which gets included.
  *	Called from the parse module when a .INCLUDES line is parsed.
  *	The suffix must have already been defined.
+ *
  * Input:
  *	sname		Name of the suffix to mark
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	The SUFF_INCLUDE bit is set in the suffix's flags field
+ *
  *-----------------------------------------------------------------------
  */
 void
 Suff_AddInclude(char *sname)
+{
     LstNode	  ln;
     Suff	  *s;
-    ln = Lst_Find(sufflist, SuffSuffHasNameP, sname);
+    ln = Lst_FindS(sufflist, SuffSuffHasNameP, sname);
     if (ln != NULL) {
 	s = Lst_DatumS(ln);
 	s->flags |= SUFF_INCLUDE;
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Suff_AddLib --
  *	Add the given suffix as a type of file which is a library.
  *	Called from the parse module when parsing a .LIBS line. The
  *	suffix must have been defined via .SUFFIXES before this is
  *	called.
 @@ -1145,27 +1145,27 @@ Suff_AddInclude(char *sname)
  *	None.
+ *
  * Side Effects:
  *	The SUFF_LIBRARY bit is set in the suffix's flags field
+ *
  *-----------------------------------------------------------------------
  */
 void
 Suff_AddLib(char *sname)
+{
     LstNode	  ln;
     Suff	  *s;
-    ln = Lst_Find(sufflist, SuffSuffHasNameP, sname);
+    ln = Lst_FindS(sufflist, SuffSuffHasNameP, sname);
     if (ln != NULL) {
 	s = Lst_DatumS(ln);
 	s->flags |= SUFF_LIBRARY;
+    }
+}
 	  /********** Implicit Source Search Functions *********/
 /*-
  *-----------------------------------------------------------------------
  * SuffAddSrc  --
  *	Add a suffix as a Src structure to the given list with its parent
  *	being the given Src structure. If the suffix is the null suffix,
 @@ -1298,27 +1298,27 @@ SuffRemoveSrc(Lst l)
 	    free(s->file);
 	    if (!s->parent)
 		free(s->pref);
 	    else {
 #ifdef DEBUG_SRC
 		LstNode ln2 = Lst_MemberS(s->parent->cp, s);
 		if (ln2 != NULL)
 		    Lst_RemoveS(s->parent->cp, ln2);
 #endif
 		--s->parent->children;
+	    }
 #ifdef DEBUG_SRC
 	    fprintf(debug_file, "free: [l=%p] p=%p %d\n", l, s, s->children);
-	    Lst_Destroy(s->cp, NULL);
+	    Lst_FreeS(s->cp);
 #endif
 	    Lst_RemoveS(l, ln);
 	    free(s);
 	    t |= 1;
 	    Lst_CloseS(l);
 	    return TRUE;
+	}
 #ifdef DEBUG_SRC
 	else {
 	    fprintf(debug_file, "keep: [l=%p] p=%p %d: ", l, s, s->children);
 	    Lst_ForEach(s->cp, PrintAddr, NULL);
 	    fprintf(debug_file, "\n");
+	}
 @@ -1450,27 +1450,27 @@ SuffFindCmds(Src *targ, Lst slst)
 	cp = strrchr(s->name, '/');
 	if (cp == NULL) {
 	    cp = s->name;
 	} else {
 	    cp++;
+	}
 	if (strncmp(cp, targ->pref, prefLen) != 0)
 	    continue;
 	/*
 	 * The node matches the prefix ok, see if it has a known
 	 * suffix.
 	 */
-	ln = Lst_Find(sufflist, SuffSuffHasNameP, &cp[prefLen]);
+	ln = Lst_FindS(sufflist, SuffSuffHasNameP, &cp[prefLen]);
 	if (ln == NULL)
 	    continue;
 	/*
 	 * It even has a known suffix, see if there's a transformation
 	 * defined between the node's suffix and the target's suffix.
+	 *
 	 * XXX: Handle multi-stage transformations here, too.
 	 */
 	suff = Lst_DatumS(ln);
 	/* XXX: Can targ->suff be NULL here? */
 	if (targ->suff != NULL &&
 	    Lst_MemberS(suff->parents, targ->suff) != NULL)
 @@ -1641,27 +1641,27 @@ SuffExpandChildren(LstNode cln, GNode *p
 	while(!Lst_IsEmpty(members)) {
 	    gn = Lst_DequeueS(members);
 	    if (DEBUG(SUFF)) {
 		fprintf(debug_file, "%s...", gn->name);
+	    }
 	    /* Add gn to the parents child list before the original child */
 	    Lst_InsertBeforeS(pgn->children, cln, gn);
 	    Lst_AppendS(gn->parents, pgn);
 	    pgn->unmade++;
 	    /* Expand wildcards on new node */
 	    SuffExpandWildcards(Lst_PrevS(cln), pgn);
+	}
-	Lst_Destroy(members, NULL);
+	Lst_FreeS(members);
 	/*
 	 * Free the result
 	 */
 	free(cp);
+    }
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "\n");
+    }
     /*
      * Now the source is expanded, remove it from the list of children to
      * keep it from being processed.
 @@ -1695,30 +1695,27 @@ SuffExpandWildcards(LstNode cln, GNode *
 	cp = Lst_DequeueS(explist);
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "%s...", cp);
+	}
 	gn = Targ_FindNode(cp, TARG_CREATE);
 	/* Add gn to the parents child list before the original child */
 	Lst_InsertBeforeS(pgn->children, cln, gn);
 	Lst_AppendS(gn->parents, pgn);
 	pgn->unmade++;
+    }
-    /*
+    Lst_FreeS(explist);
      * Nuke what's left of the list
      */
     Lst_Destroy(explist, NULL);
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "\n");
+    }
     /*
      * Now the source is expanded, remove it from the list of children to
      * keep it from being processed.
      */
     pgn->unmade--;
     Lst_RemoveS(pgn->children, cln);
     Lst_RemoveS(cgn->parents, Lst_MemberS(cgn->parents, pgn));
+}
 @@ -1743,27 +1740,27 @@ SuffExpandWildcards(LstNode cln, GNode *
+ *
  *-----------------------------------------------------------------------
  */
 Lst
 Suff_FindPath(GNode* gn)
+{
     Suff *suff = gn->suffix;
     if (suff == NULL) {
 	SuffixCmpData sd;   /* Search string data */
 	LstNode ln;
 	sd.len = strlen(gn->name);
 	sd.ename = gn->name + sd.len;
-	ln = Lst_Find(sufflist, SuffSuffIsSuffixP, &sd);
+	ln = Lst_FindS(sufflist, SuffSuffIsSuffixP, &sd);
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "Wildcard expanding \"%s\"...", gn->name);
+	}
 	if (ln != NULL)
 	    suff = Lst_DatumS(ln);
 	/* XXX: Here we can save the suffix so we don't have to do this again */
+    }
     if (suff != NULL) {
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "suffix is \"%s\"...", suff->name);
+	}
 @@ -1954,28 +1951,28 @@ SuffFindArchiveDeps(GNode *gn, Lst slst)
      */
     Var_Set(MEMBER, name, gn);
     Var_Set(ARCHIVE, gn->name, gn);
     /*
      * Set $@ for compatibility with other makes
      */
     Var_Set(TARGET, gn->name, gn);
     /*
      * Now we've got the important local variables set, expand any sources
      * that still contain variables or wildcards in their names.
      */
-    for (ln = Lst_First(gn->children); ln != NULL; ln = nln) {
+    for (ln = Lst_FirstS(gn->children); ln != NULL; ln = nln) {
-	nln = Lst_Succ(ln);
+	nln = Lst_SuccS(ln);
 	SuffExpandChildren(ln, gn);
+    }
     if (ms != NULL) {
 	/*
 	 * Member has a known suffix, so look for a transformation rule from
 	 * it to a possible suffix of the archive. Rather than searching
 	 * through the entire list, we just look at suffixes to which the
 	 * member's suffix may be transformed...
 	 */
 	SuffixCmpData	sd;		/* Search string data */
 	/*
 @@ -2460,27 +2457,27 @@ SuffFindDeps(GNode *gn, Lst slst)
 	SuffFindArchiveDeps(gn, slst);
     } else if (gn->type & OP_LIB) {
 	/*
 	 * If the node is a library, it is the arch module's job to find it
 	 * and set the TARGET variable accordingly. We merely provide the
 	 * search path, assuming all libraries end in ".a" (if the suffix
 	 * hasn't been defined, there's nothing we can do for it, so we just
 	 * set the TARGET variable to the node's name in order to give it a
 	 * value).
 	 */
 	LstNode	ln;
 	Suff	*s;
-	ln = Lst_Find(sufflist, SuffSuffHasNameP, LIBSUFF);
+	ln = Lst_FindS(sufflist, SuffSuffHasNameP, LIBSUFF);
 	if (gn->suffix)
 	    gn->suffix->refCount--;
 	if (ln != NULL) {
 	    gn->suffix = s = Lst_DatumS(ln);
 	    gn->suffix->refCount++;
 	    Arch_FindLib(gn, s->searchPath);
 	} else {
 	    gn->suffix = NULL;
 	    Var_Set(TARGET, gn->name, gn);
+	}
 	/*
 	 * Because a library (-lfoo) target doesn't follow the standard
 	 * filesystem conventions, we don't set the regular variables for
 @@ -2508,27 +2505,27 @@ SuffFindDeps(GNode *gn, Lst slst)
+ *
  * Notes:
  *	Need to handle the changing of the null suffix gracefully so the
  *	old transformation rules don't just go away.
+ *
  *-----------------------------------------------------------------------
  */
 void
 Suff_SetNull(char *name)
+{
     Suff    *s;
     LstNode ln;
-    ln = Lst_Find(sufflist, SuffSuffHasNameP, name);
+    ln = Lst_FindS(sufflist, SuffSuffHasNameP, name);
     if (ln != NULL) {
 	s = Lst_DatumS(ln);
 	if (suffNull != NULL) {
 	    suffNull->flags &= ~SUFF_NULL;
+	}
 	s->flags |= SUFF_NULL;
 	/*
 	 * XXX: Here's where the transformation mangling would take place
 	 */
 	suffNull = s;
     } else {
 	Parse_Error(PARSE_WARNING, "Desired null suffix %s not defined.",
 		     name);
 @@ -2573,32 +2570,32 @@ Suff_Init(void)
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	The memory is free'd.
  *----------------------------------------------------------------------
  */
 void
 Suff_End(void)
+{
 #ifdef CLEANUP
-    Lst_Destroy(sufflist, SuffFree);
+    Lst_DestroyS(sufflist, SuffFree);
-    Lst_Destroy(suffClean, SuffFree);
+    Lst_DestroyS(suffClean, SuffFree);
     if (suffNull)
 	SuffFree(suffNull);
-    Lst_Destroy(srclist, NULL);
+    Lst_FreeS(srclist);
-    Lst_Destroy(transforms, NULL);
+    Lst_FreeS(transforms);
 #endif
+}
 /********************* DEBUGGING FUNCTIONS **********************/
 static int SuffPrintName(void *s, void *dummy MAKE_ATTR_UNUSED)
+{
     fprintf(debug_file, "%s ", ((Suff *)s)->name);
     return 0;
+}
 @@ -2623,30 +2620,30 @@ SuffPrintSuff(void *sp, void *dummy MAKE
 		    break;
 		case SUFF_INCLUDE:
 		    fprintf(debug_file, "INCLUDE");
 		    break;
 		case SUFF_LIBRARY:
 		    fprintf(debug_file, "LIBRARY");
 		    break;
+	    }
 	    fputc(flags ? '|' : ')', debug_file);
+	}
+    }
     fputc('\n', debug_file);
     fprintf(debug_file, "#\tTo: ");
-    Lst_ForEach(s->parents, SuffPrintName, NULL);
+    Lst_ForEachS(s->parents, SuffPrintName, NULL);
     fputc('\n', debug_file);
     fprintf(debug_file, "#\tFrom: ");
-    Lst_ForEach(s->children, SuffPrintName, NULL);
+    Lst_ForEachS(s->children, SuffPrintName, NULL);
     fputc('\n', debug_file);
     fprintf(debug_file, "#\tSearch Path: ");
     Dir_PrintPath(s->searchPath);
     fputc('\n', debug_file);
     return 0;
+}
 static int
 SuffPrintTrans(void *tp, void *dummy MAKE_ATTR_UNUSED)
+{
     GNode   *t = (GNode *)tp;
     fprintf(debug_file, "%-16s: ", t->name);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lst.h,v 1.43 2020/08/23 17:04:21 rillig Exp $	*/
+/*	$NetBSD: lst.h,v 1.44 2020/08/26 22:55:46 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -95,78 +95,88 @@ typedef	struct ListNode	*LstNode;
 typedef void *LstCopyProc(void *);
 typedef void LstFreeProc(void *);
 typedef int LstFindProc(const void *, const void *);
 typedef int LstActionProc(void *, void *);
 /*
  * Creation/destruction functions
  */
 /* Create a new list */
 Lst		Lst_Init(void);
 /* Duplicate an existing list */
 Lst		Lst_CopyS(Lst, LstCopyProc);
 /* Destroy an old one */
-void		Lst_Destroy(Lst, LstFreeProc);
+void		Lst_FreeS(Lst);
 void		Lst_DestroyS(Lst, LstFreeProc);
 /* True if list is empty */
 Boolean		Lst_IsEmpty(Lst);
 Boolean		Lst_IsEmptyS(Lst);
 /*
  * Functions to modify a list
  */
 /* Insert an element before another */
 void		Lst_InsertBeforeS(Lst, LstNode, void *);
 /* Place an element at the front of a lst. */
 void		Lst_PrependS(Lst, void *);
 /* Place an element at the end of a lst. */
 void		Lst_AppendS(Lst, void *);
 /* Remove an element */
 void		Lst_RemoveS(Lst, LstNode);
 /* Replace a node with a new value */
 void		LstNode_SetS(LstNode, void *);
 void		LstNode_SetNullS(LstNode);
 void		Lst_PrependAllS(Lst, Lst);
 void		Lst_AppendAllS(Lst, Lst);
 void		Lst_MoveAllS(Lst, Lst);
 /*
  * Node-specific functions
  */
 /* Return first element in list */
 LstNode		Lst_First(Lst);
 LstNode		Lst_FirstS(Lst);
 /* Return last element in list */
 LstNode		Lst_Last(Lst);
 LstNode		Lst_LastS(Lst);
 /* Return successor to given element */
 LstNode		Lst_Succ(LstNode);
 LstNode		Lst_SuccS(LstNode);
 /* Return predecessor to given element */
 LstNode		Lst_PrevS(LstNode);
 /* Get datum from LstNode */
 void		*Lst_DatumS(LstNode);
 /*
  * Functions for entire lists
  */
 /* Find an element in a list */
 LstNode		Lst_Find(Lst, LstFindProc, const void *);
 LstNode		Lst_FindS(Lst, LstFindProc, const void *);
 /* Find an element starting from somewhere */
 LstNode		Lst_FindFrom(Lst, LstNode, LstFindProc, const void *);
 LstNode		Lst_FindFromS(Lst, LstNode, LstFindProc, const void *);
 /*
  * See if the given datum is on the list. Returns the LstNode containing
  * the datum
  */
 LstNode		Lst_MemberS(Lst, void *);
 /* Apply a function to all elements of a lst */
 int		Lst_ForEach(Lst, LstActionProc, void *);
 int		Lst_ForEachS(Lst, LstActionProc, void *);
 /* Apply a function to all elements of a lst starting from a certain point. */
 int		Lst_ForEachFrom(Lst, LstNode, LstActionProc, void *);
 int		Lst_ForEachFromS(Lst, LstNode, LstActionProc, void *);
 /*
  * these functions are for dealing with a list as a table, of sorts.
  * An idea of the "current element" is kept and used by all the functions
  * between Lst_Open() and Lst_Close().
  */
 /* Open the list */
 ReturnStatus	Lst_Open(Lst);
 void		Lst_OpenS(Lst);
 /* Next element please, or NULL */
 LstNode		Lst_NextS(Lst);
 /* Finish table access */
 void		Lst_CloseS(Lst);

 @@ -1,14 +1,14 @@
-/*      $NetBSD: meta.c,v 1.99 2020/08/23 16:58:02 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.100 2020/08/26 22:55:46 rillig Exp $ */
 /*
  * Implement 'meta' mode.
  * Adapted from John Birrell's patches to FreeBSD make.
  * --sjg
  */
 /*
  * Copyright (c) 2009-2016, Juniper Networks, Inc.
  * Portions Copyright (c) 2009, John Birrell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -879,29 +879,31 @@ meta_job_finish(Job *job)
 	error = meta_cmd_finish(pbm);
 	x = fclose(pbm->mfp);
 	if (error == 0 && x != 0)
 	    error = errno;
 	pbm->mfp = NULL;
 	pbm->meta_fname[0] = '\0';
+    }
     return error;
+}
 void
 meta_finish(void)
+{
-    Lst_Destroy(metaBailiwick, NULL);
+    if (metaBailiwick != NULL)
 	Lst_FreeS(metaBailiwick);
     free(metaBailiwickStr);
-    Lst_Destroy(metaIgnorePaths, NULL);
+    if (metaIgnorePaths != NULL)
 	Lst_FreeS(metaIgnorePaths);
     free(metaIgnorePathsStr);
+}
 /*
  * Fetch a full line from fp - growing bufp if needed
  * Return length in bufp.
  */
 static int
 fgetLine(char **bufp, size_t *szp, int o, FILE *fp)
+{
     char *buf = *bufp;
     size_t bufsz = *szp;
     struct stat fs;
 @@ -1613,27 +1615,27 @@ meta_oodate(GNode *gn, Boolean oodate)
 		if (strncmp(curdir, gn->path, (cp - gn->path)) != 0) {
 		    cp = NULL;		/* not in .CURDIR */
+		}
+	    }
 	    if (!cp) {
 		if (DEBUG(META))
 		    fprintf(debug_file, "%s: required but missing\n", fname);
 		oodate = TRUE;
 		needOODATE = TRUE;	/* assume the worst */
+	    }
+	}
+    }
-    Lst_Destroy(missingFiles, free);
+    Lst_DestroyS(missingFiles, free);
     if (oodate && needOODATE) {
 	/*
 	 * Target uses .OODATE which is empty; or we wouldn't be here.
 	 * We have decided it is oodate, so .OODATE needs to be set.
 	 * All we can sanely do is set it to .ALLSRC.
 	 */
 	Var_Delete(OODATE, gn);
 	Var_Set(OODATE, Var_Value(ALLSRC, gn, &cp), gn);
 	bmake_free(cp);
+    }
  oodate_out: