 @@ -1,14 +1,14 @@
-/*	$NetBSD: arch.c,v 1.98 2020/08/27 06:13:53 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.99 2020/08/27 19:15:35 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.98 2020/08/27 06:13:53 rillig Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.99 2020/08/27 19:15:35 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.98 2020/08/27 06:13:53 rillig Exp $");
+__RCSID("$NetBSD: arch.c,v 1.99 2020/08/27 19:15:35 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.
 @@ -386,27 +386,27 @@ Arch_ParseArchive(char **linePtr, Lst no
 		free(buf);
 		return FALSE;
+	    }
 	    /*
 	     * Free buffer and continue with our work.
 	     */
 	    free(buf);
 	} else if (Dir_HasWildcards(memName)) {
 	    Lst members = Lst_Init();
 	    Buffer nameBuf;
 	    Buf_Init(&nameBuf, 0);
 	    Dir_Expand(memName, dirSearchPath, members);
-	    while (!Lst_IsEmpty(members)) {
+	    while (!Lst_IsEmptyS(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);
 		gn = Targ_FindNode(Buf_GetAll(&nameBuf, NULL), TARG_CREATE);
 		if (gn == NULL) {
 		    Buf_Destroy(&nameBuf, TRUE);
 		    return FALSE;
 @@ -1242,29 +1242,29 @@ Arch_FindLib(GNode *gn, Lst path)
+ *
  * Side Effects:
  *	The library will be hashed if it hasn't been already.
+ *
  *-----------------------------------------------------------------------
  */
 Boolean
 Arch_LibOODate(GNode *gn)
+{
     Boolean 	  oodate;
     if (gn->type & OP_PHONY) {
 	oodate = TRUE;
-    } else if (OP_NOP(gn->type) && Lst_IsEmpty(gn->children)) {
+    } else if (OP_NOP(gn->type) && Lst_IsEmptyS(gn->children)) {
 	oodate = FALSE;
-    } else if ((!Lst_IsEmpty(gn->children) && gn->cmgn == NULL) ||
+    } else if ((!Lst_IsEmptyS(gn->children) && gn->cmgn == NULL) ||
 	       (gn->mtime > now) ||
 	       (gn->cmgn != NULL && gn->mtime < gn->cmgn->mtime)) {
 	oodate = TRUE;
     } else {
 #ifdef RANLIBMAG
 	struct ar_hdr  	*arhPtr;    /* Header for __.SYMDEF */
 	int 	  	modTimeTOC; /* The table-of-contents's mod time */
 	arhPtr = ArchStatMember(gn->path, RANLIBMAG, FALSE);
 	if (arhPtr != NULL) {
 	    modTimeTOC = (int)strtol(arhPtr->ar_date, NULL, 10);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat.c,v 1.130 2020/08/27 06:53:57 rillig Exp $	*/
+/*	$NetBSD: compat.c,v 1.131 2020/08/27 19:15:35 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.
 @@ -60,34 +60,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: compat.c,v 1.130 2020/08/27 06:53:57 rillig Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.131 2020/08/27 19:15:35 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: compat.c,v 1.130 2020/08/27 06:53:57 rillig Exp $");
+__RCSID("$NetBSD: compat.c,v 1.131 2020/08/27 19:15:35 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * compat.c --
  *	The routines in this file implement the full-compatibility
  *	mode of PMake. Most of the special functionality of PMake
  *	is available in this mode. Things not supported:
  *	    - different shells.
  *	    - friendly variable substitution.
+ *
  * Interface:
 @@ -737,27 +737,27 @@ Compat_Run(Lst targs)
     Make_ExpandUse(targs);
     /*
      * For each entry in the list of targets to create, call Compat_Make on
      * it to create the thing. Compat_Make will leave the 'made' field of gn
      * in one of several states:
      *	    UPTODATE	    gn was already up-to-date
      *	    MADE  	    gn was recreated successfully
      *	    ERROR 	    An error occurred while gn was being created
      *	    ABORTED	    gn was not remade because one of its inferiors
      *	    	  	    could not be made due to errors.
      */
     errors = 0;
-    while (!Lst_IsEmpty(targs)) {
+    while (!Lst_IsEmptyS(targs)) {
 	gn = Lst_DequeueS(targs);
 	Compat_Make(gn, gn);
 	if (gn->made == UPTODATE) {
 	    printf("`%s' is up to date.\n", gn->name);
 	} else if (gn->made == ABORTED) {
 	    printf("`%s' not remade because of errors.\n", gn->name);
 	    errors += 1;
+	}
+    }
     /*
      * If the user has defined a .END target, run its commands.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.100 2020/08/23 16:58:02 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.101 2020/08/27 19:15:35 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.
 @@ -60,34 +60,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: cond.c,v 1.100 2020/08/23 16:58:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.101 2020/08/27 19:15:35 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.100 2020/08/23 16:58:02 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.101 2020/08/27 19:15:35 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * cond.c --
  *	Functions to handle conditionals in a makefile.
+ *
  * Interface:
  *	Cond_Eval 	Evaluate the conditional in the passed line.
+ *
  */
 @@ -316,27 +316,27 @@ CondDoTarget(int argLen MAKE_ATTR_UNUSED
     gn = Targ_FindNode(arg, TARG_NOCREATE);
     return gn != NULL && !OP_NOP(gn->type);
+}
 /* See if the given node exists and is an actual target with commands
  * associated with it. */
 static Boolean
 CondDoCommands(int argLen MAKE_ATTR_UNUSED, const char *arg)
+{
     GNode *gn;
     gn = Targ_FindNode(arg, TARG_NOCREATE);
-    return gn != NULL && !OP_NOP(gn->type) && !Lst_IsEmpty(gn->commands);
+    return gn != NULL && !OP_NOP(gn->type) && !Lst_IsEmptyS(gn->commands);
+}
 /*-
  * Convert the given number into a double.
  * We try a base 10 or 16 integer conversion first, if that fails
  * then we try a floating point conversion instead.
+ *
  * Results:
  *	Sets 'value' to double value of string.
  *	Returns TRUE if the conversion succeeded.
  */
 static Boolean
 CondCvtArg(const char *str, double *value)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir.c,v 1.114 2020/08/27 07:00:29 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.115 2020/08/27 19:15:35 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.
 @@ -60,34 +60,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: dir.c,v 1.114 2020/08/27 07:00:29 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.115 2020/08/27 19:15:35 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)dir.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: dir.c,v 1.114 2020/08/27 07:00:29 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.115 2020/08/27 19:15:35 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * dir.c --
  *	Directory searching using wildcards and/or normal names...
  *	Used both for source wildcarding in the Makefile and for finding
  *	implicit sources.
+ *
  * The interface for this module is:
  *	Dir_Init  	    Initialize the module.
+ *
 @@ -1468,27 +1468,27 @@ Dir_MTime(GNode *gn, Boolean recheck)
     struct stat stb;		/* buffer for finding the mod time */
     if (gn->type & OP_ARCHV) {
 	return Arch_MTime(gn);
     } else if (gn->type & OP_PHONY) {
 	gn->mtime = 0;
 	return 0;
     } else if (gn->path == NULL) {
 	if (gn->type & OP_NOPATH)
 	    fullName = NULL;
 	else {
 	    fullName = Dir_FindFile(gn->name, Suff_FindPath(gn));
 	    if (fullName == NULL && gn->flags & FROM_DEPEND &&
-		!Lst_IsEmpty(gn->iParents)) {
+		!Lst_IsEmptyS(gn->iParents)) {
 		char *cp;
 		cp = strrchr(gn->name, '/');
 		if (cp) {
 		    /*
 		     * This is an implied source, and it may have moved,
 		     * see if we can find it via the current .PATH
 		     */
 		    cp++;
 		    fullName = Dir_FindFile(cp, Suff_FindPath(gn));
 		    if (fullName) {
 			/*
 @@ -1723,27 +1723,27 @@ Dir_Destroy(void *pp)
  *	path		Path to clear
+ *
  * Results:
  *	None.
+ *
  * Side Effects:
  *	The path is set to the empty list.
+ *
  *-----------------------------------------------------------------------
  */
 void
 Dir_ClearPath(Lst path)
+{
-    while (!Lst_IsEmpty(path)) {
+    while (!Lst_IsEmptyS(path)) {
 	Path *p = Lst_DequeueS(path);
 	Dir_Destroy(p);
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Dir_Concat --
  *	Concatenate two paths, adding the second to the end of the first.
  *	Makes sure to avoid duplicates.
+ *
  * Input:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.218 2020/08/27 07:00:29 rillig Exp $	*/
+/*	$NetBSD: job.c,v 1.219 2020/08/27 19:15:35 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.
 @@ -60,34 +60,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: job.c,v 1.218 2020/08/27 07:00:29 rillig Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.219 2020/08/27 19:15:35 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: job.c,v 1.218 2020/08/27 07:00:29 rillig Exp $");
+__RCSID("$NetBSD: job.c,v 1.219 2020/08/27 19:15:35 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * job.c --
  *	handle the creation etc. of our child processes.
+ *
  * Interface:
  *	Job_Make  	    	Start the creation of the given target.
+ *
  *	Job_CatchChildren   	Check for and handle the termination of any
  *	    	  	    	children. This must be called reasonably
 @@ -1224,33 +1224,33 @@ Job_Touch(GNode *gn, Boolean silent)
  *	abortProc	Function to abort with message
+ *
  * Results:
  *	TRUE if the commands list is/was ok.
+ *
  * Side Effects:
  *	The node will have commands from the .DEFAULT rule added to it
  *	if it needs them.
  *-----------------------------------------------------------------------
  */
 Boolean
 Job_CheckCommands(GNode *gn, void (*abortProc)(const char *, ...))
+{
-    if (OP_NOP(gn->type) && Lst_IsEmpty(gn->commands) &&
+    if (OP_NOP(gn->type) && Lst_IsEmptyS(gn->commands) &&
-	((gn->type & OP_LIB) == 0 || Lst_IsEmpty(gn->children))) {
+	((gn->type & OP_LIB) == 0 || Lst_IsEmptyS(gn->children))) {
 	/*
 	 * No commands. Look for .DEFAULT rule from which we might infer
 	 * commands
 	 */
-	if ((DEFAULT != NULL) && !Lst_IsEmpty(DEFAULT->commands) &&
+	if ((DEFAULT != NULL) && !Lst_IsEmptyS(DEFAULT->commands) &&
 		(gn->type & OP_SPECIAL) == 0) {
 	    char *p1;
 	    /*
 	     * Make only looks for a .DEFAULT if the node was never the
 	     * target of an operator, so that's what we do too. If
 	     * a .DEFAULT was given, we substitute its commands for gn's
 	     * commands and set the IMPSRC variable to be the target's name
 	     * The DEFAULT node acts like a transformation rule, in that
 	     * gn also inherits any attributes or sources attached to
 	     * .DEFAULT itself.
 	     */
 	    Make_HandleUse(DEFAULT, gn);
 	    Var_Set(IMPSRC, Var_Value(TARGET, gn, &p1), gn);
 @@ -2661,28 +2661,28 @@ JobInterrupt(int runINTERRUPT, int signo
  *	attached to the .END target.
+ *
  * Results:
  *	Number of errors reported.
+ *
  * Side Effects:
  *	None.
  *-----------------------------------------------------------------------
  */
 int
 Job_Finish(void)
+{
     if (postCommands != NULL &&
-	(!Lst_IsEmpty(postCommands->commands) ||
+	(!Lst_IsEmptyS(postCommands->commands) ||
-	 !Lst_IsEmpty(postCommands->children))) {
+	 !Lst_IsEmptyS(postCommands->children))) {
 	if (errors) {
 	    Error("Errors reported so .END ignored");
 	} else {
 	    JobRun(postCommands);
+	}
+    }
     return errors;
+}
 /*-
  *-----------------------------------------------------------------------
  * Job_End --
  *	Cleanup any memory used by the jobs module

 @@ -1,14 +1,14 @@
-/* $NetBSD: lst.c,v 1.46 2020/08/27 07:03:48 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.47 2020/08/27 19:15:35 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.46 2020/08/27 07:03:48 rillig Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.47 2020/08/27 19:15:35 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.46 2020/08/27 07:03:48 rillig Exp $");
+__RCSID("$NetBSD: lst.c,v 1.47 2020/08/27 19:15:35 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 */
 @@ -380,33 +380,26 @@ Lst_PrevS(LstNode node)
 /* Return the datum stored in the given node. */
 void *
 Lst_DatumS(LstNode node)
+{
     assert(LstNodeIsValid(node));
     return node->datum;
+}
 /*
  * 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)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.316 2020/08/27 07:00:29 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.317 2020/08/27 19:15:35 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.316 2020/08/27 07:00:29 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.317 2020/08/27 19:15:35 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.316 2020/08/27 07:00:29 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.317 2020/08/27 19:15:35 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
 @@ -1265,27 +1265,27 @@ main(int argc, char **argv)
 	Suff_Init();
 	Trace_Init(tracefile);
 	DEFAULT = NULL;
 	(void)time(&now);
 	Trace_Log(MAKESTART, NULL);
 	/*
 	 * Set up the .TARGETS variable to contain the list of targets to be
 	 * created. If none specified, make the variable empty -- the parser
 	 * will fill the thing in with the default or .MAIN target.
 	 */
-	if (!Lst_IsEmpty(create)) {
+	if (!Lst_IsEmptyS(create)) {
 		LstNode ln;
 		for (ln = Lst_First(create); ln != NULL; ln = Lst_SuccS(ln)) {
 			char *name = Lst_DatumS(ln);
 			Var_Append(".TARGETS", name, VAR_GLOBAL);
+		}
 	} else
 		Var_Set(".TARGETS", "", VAR_GLOBAL);
 	/*
 	 * If no user-supplied system path was given (through the -m option)
 	 * add the directories from the DEFSYSPATH (more than one may be given
 @@ -1315,38 +1315,38 @@ main(int argc, char **argv)
 	if (syspath != defsyspath)
 		free(syspath);
 	/*
 	 * Read in the built-in rules first, followed by the specified
 	 * makefile, if it was (makefile != NULL), or the default
 	 * makefile and Makefile, in that order, if it wasn't.
 	 */
 	if (!noBuiltins) {
 		LstNode ln;
 		sysMkPath = Lst_Init();
 		Dir_Expand(_PATH_DEFSYSMK,
-			   Lst_IsEmpty(sysIncPath) ? defIncPath : sysIncPath,
+			   Lst_IsEmptyS(sysIncPath) ? defIncPath : sysIncPath,
 			   sysMkPath);
-		if (Lst_IsEmpty(sysMkPath))
+		if (Lst_IsEmptyS(sysMkPath))
 			Fatal("%s: no system rules (%s).", progname,
 			    _PATH_DEFSYSMK);
 		ln = Lst_Find(sysMkPath, ReadMakefile, NULL);
 		if (ln == NULL)
 			Fatal("%s: cannot open %s.", progname,
 			    (char *)Lst_DatumS(ln));
+	}
-	if (!Lst_IsEmpty(makefiles)) {
+	if (!Lst_IsEmptyS(makefiles)) {
 		LstNode ln;
 		ln = Lst_Find(makefiles, ReadAllMakefiles, NULL);
 		if (ln != NULL)
 			Fatal("%s: cannot open %s.", progname,
 			    (char *)Lst_DatumS(ln));
 	} else {
 	    p1 = Var_Subst("${" MAKEFILE_PREFERENCE "}",
 		VAR_CMD, VARE_WANTRES);
 	    if (p1) {
 		(void)str2Lst_Append(makefiles, p1, NULL);
 		(void)Lst_Find(makefiles, ReadMakefile, NULL);
 		free(p1);
 @@ -1534,27 +1534,27 @@ ReadMakefile(const void *p, const void *
 			if (fd != -1) {
 				fname = path;
 				goto found;
+			}
 		} else {
 			fd = open(fname, O_RDONLY);
 			if (fd != -1)
 				goto found;
+		}
 		/* look in -I and system include directories. */
 		name = Dir_FindFile(fname, parseIncPath);
 		if (!name)
 			name = Dir_FindFile(fname,
-				Lst_IsEmpty(sysIncPath) ? defIncPath : sysIncPath);
+				Lst_IsEmptyS(sysIncPath) ? defIncPath : sysIncPath);
 		if (!name || (fd = open(name, O_RDONLY)) == -1) {
 			free(name);
 			free(path);
 			return -1;
+		}
 		fname = name;
 		/*
 		 * set the MAKEFILE variable desired by System V fans -- the
 		 * placement of the setting here means it gets set to the last
 		 * makefile specified, as it is set by SysV make.
 		 */
 found:
 		if (!doing_depend)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.c,v 1.126 2020/08/27 06:53:57 rillig Exp $	*/
+/*	$NetBSD: make.c,v 1.127 2020/08/27 19:15:35 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.126 2020/08/27 06:53:57 rillig Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.127 2020/08/27 19:15:35 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.126 2020/08/27 06:53:57 rillig Exp $");
+__RCSID("$NetBSD: make.c,v 1.127 2020/08/27 19:15:35 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
 @@ -464,27 +464,27 @@ MakeFindChild(void *gnp, void *pgnp)
  */
 void
 Make_HandleUse(GNode *cgn, GNode *pgn)
+{
     LstNode	ln; 	/* An element in the children list */
 #ifdef DEBUG_SRC
     if ((cgn->type & (OP_USE|OP_USEBEFORE|OP_TRANSFORM)) == 0) {
 	fprintf(debug_file, "Make_HandleUse: called for plain node %s\n", cgn->name);
 	return;
+    }
 #endif
-    if ((cgn->type & (OP_USE|OP_USEBEFORE)) || Lst_IsEmpty(pgn->commands)) {
+    if ((cgn->type & (OP_USE|OP_USEBEFORE)) || Lst_IsEmptyS(pgn->commands)) {
 	    if (cgn->type & OP_USEBEFORE) {
 		/* .USEBEFORE */
 		Lst_PrependAllS(pgn->commands, cgn->commands);
 	    } else {
 		/* .USE, or target has no commands */
 		Lst_AppendAllS(pgn->commands, cgn->commands);
+	    }
+    }
     Lst_OpenS(cgn->children);
     while ((ln = Lst_NextS(cgn->children)) != NULL) {
 	GNode *gn = Lst_DatumS(ln);
 @@ -604,27 +604,27 @@ Make_Recheck(GNode *gn)
      *  	cmp -s y.tab.h parse.h || mv y.tab.h parse.h
+     *
      * In this case, if the definitions produced by yacc haven't changed
      * from before, parse.h won't have been updated and gn->mtime will
      * reflect the current modification time for parse.h. This is
      * something of a kludge, I admit, but it's a useful one..
      * XXX: People like to use a rule like
+     *
      * FRC:
+     *
      * To force things that depend on FRC to be made, so we have to
      * check for gn->children being empty as well...
      */
-    if (!Lst_IsEmpty(gn->commands) || Lst_IsEmpty(gn->children)) {
+    if (!Lst_IsEmptyS(gn->commands) || Lst_IsEmptyS(gn->children)) {
 	gn->mtime = now;
+    }
 #else
     /*
      * This is what Make does and it's actually a good thing, as it
      * allows rules like
+     *
      *	cmp -s y.tab.h parse.h || cp y.tab.h parse.h
+     *
      * to function as intended. Unfortunately, thanks to the stateless
      * nature of NFS (by which I mean the loose coupling of two clients
      * using the same file from a common server), there are times
      * when the modification time of a file created on a remote
 @@ -714,27 +714,27 @@ Make_Update(GNode *cgn)
      * If the child was actually made, see what its modification time is
      * now -- some rules won't actually update the file. If the file still
      * doesn't exist, make its mtime now.
      */
     if (cgn->made != UPTODATE) {
 	mtime = Make_Recheck(cgn);
+    }
     /*
      * If this is a `::' node, we must consult its first instance
      * which is where all parents are linked.
      */
     if ((centurion = cgn->centurion) != NULL) {
-	if (!Lst_IsEmpty(cgn->parents))
+	if (!Lst_IsEmptyS(cgn->parents))
 		Punt("%s%s: cohort has parents", cgn->name, cgn->cohort_num);
 	centurion->unmade_cohorts -= 1;
 	if (centurion->unmade_cohorts < 0)
 	    Error("Graph cycles through centurion %s", centurion->name);
     } else {
 	centurion = cgn;
+    }
     parents = centurion->parents;
     /* If this was a .ORDER node, schedule the RHS */
     Lst_ForEachS(centurion->order_succ, MakeBuildParent, Lst_First(toBeMade));
     /* Now mark all the parents as having one less unmade child */
 @@ -1077,27 +1077,27 @@ MakeBuildParent(void *v_pn, void *toBeMa
 	/* Mark so that when this node is built we reschedule its parents */
 	pn->flags |= DONE_ORDER;
+    }
     return 0;
+}
 static Boolean
 MakeStartJobs(void)
+{
     GNode	*gn;
     int		have_token = 0;
-    while (!Lst_IsEmpty(toBeMade)) {
+    while (!Lst_IsEmptyS(toBeMade)) {
 	/* Get token now to avoid cycling job-list when we only have 1 token */
 	if (!have_token && !Job_TokenWithdraw())
 	    break;
 	have_token = 1;
 	gn = Lst_DequeueS(toBeMade);
 	if (DEBUG(MAKE))
 	    fprintf(debug_file, "Examining %s%s...\n",
 		    gn->name, gn->cohort_num);
 	if (gn->made != REQUESTED) {
 	    if (DEBUG(MAKE))
 		fprintf(debug_file, "state %d\n", gn->made);
 @@ -1428,27 +1428,27 @@ Make_ProcessWait(Lst targs)
     pgn->flags = REMAKE;
     pgn->type = OP_PHONY | OP_DEPENDS;
     /* Get it displayed in the diag dumps */
     Lst_PrependS(Targ_List(), pgn);
     Lst_ForEachS(targs, link_parent, pgn);
     /* Start building with the 'dummy' .MAIN' node */
     MakeBuildChild(pgn, NULL);
     examine = Lst_Init();
     Lst_AppendS(examine, pgn);
-    while (!Lst_IsEmpty(examine)) {
+    while (!Lst_IsEmptyS(examine)) {
 	pgn = Lst_DequeueS(examine);
 	/* We only want to process each child-list once */
 	if (pgn->flags & DONE_WAIT)
 	    continue;
 	pgn->flags |= DONE_WAIT;
 	if (DEBUG(MAKE))
 	    fprintf(debug_file, "Make_ProcessWait: examine %s\n", pgn->name);
 	if (pgn->type & OP_DOUBLEDEP)
 	    Lst_PrependAllS(examine, pgn->cohorts);
 	owln = Lst_First(pgn->children);
 @@ -1526,27 +1526,27 @@ Make_Run(Lst targs)
      */
     (void)MakeStartJobs();
     /*
      * Main Loop: The idea here is that the ending of jobs will take
      * care of the maintenance of data structures and the waiting for output
      * will cause us to be idle most of the time while our children run as
      * much as possible. Because the job table is kept as full as possible,
      * the only time when it will be empty is when all the jobs which need
      * running have been run, so that is the end condition of this loop.
      * Note that the Job module will exit if there were any errors unless the
      * keepgoing flag was given.
      */
-    while (!Lst_IsEmpty(toBeMade) || jobTokensRunning > 0) {
+    while (!Lst_IsEmptyS(toBeMade) || jobTokensRunning > 0) {
 	Job_CatchOutput();
 	(void)MakeStartJobs();
+    }
     errors = Job_Finish();
     /*
      * Print the final status of each target. E.g. if it wasn't made
      * because some inferior reported an error.
      */
     if (DEBUG(MAKE))
 	 fprintf(debug_file, "done: errors %d\n", errors);
     if (errors == 0) {

 @@ -1,14 +1,14 @@
-/*      $NetBSD: meta.c,v 1.102 2020/08/27 07:00:29 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.103 2020/08/27 19:15:35 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:
 @@ -406,27 +406,27 @@ meta_needed(GNode *gn, const char *dname
     /* This may be a phony node which we don't want meta data for... */
     /* Skip .meta for .BEGIN, .END, .ERROR etc as well. */
     /* Or it may be explicitly flagged as .NOMETA */
     SKIP_META_TYPE(NOMETA);
     /* Unless it is explicitly flagged as .META */
     if (!(gn->type & OP_META)) {
 	SKIP_META_TYPE(PHONY);
 	SKIP_META_TYPE(SPECIAL);
 	SKIP_META_TYPE(MAKE);
+    }
     /* Check if there are no commands to execute. */
-    if (Lst_IsEmpty(gn->commands)) {
+    if (Lst_IsEmptyS(gn->commands)) {
 	if (verbose)
 	    fprintf(debug_file, "Skipping meta for %s: no commands\n",
 		    gn->name);
 	return FALSE;
+    }
     if ((gn->type & (OP_META|OP_SUBMAKE)) == OP_SUBMAKE) {
 	/* OP_SUBMAKE is a bit too aggressive */
 	if (Lst_ForEachS(gn->commands, is_submake, gn)) {
 	    if (DEBUG(META))
 		fprintf(debug_file, "Skipping meta for %s: .SUBMAKE\n",
 			gn->name);
 	    return FALSE;
+	}
 @@ -1322,27 +1322,27 @@ meta_oodate(GNode *gn, Boolean oodate)
 		     */
 		    cp = p;		/* save this for a second */
 		    /* now get target */
 		    if (strsep(&p, " ") == NULL)
 			continue;
 		    CHECK_VALID_META(p);
 		    move_target = p;
 		    p = cp;
 		    /* 'L' and 'M' put single quotes around the args */
 		    DEQUOTE(p);
 		    DEQUOTE(move_target);
 		    /* FALLTHROUGH */
 		case 'D':		/* unlink */
-		    if (*p == '/' && !Lst_IsEmpty(missingFiles)) {
+		    if (*p == '/' && !Lst_IsEmptyS(missingFiles)) {
 			/* remove any missingFiles entries that match p */
 			ln = Lst_Find(missingFiles, path_match, p);
 			if (ln != NULL) {
 			    LstNode nln;
 			    char *tp;
 			    do {
 				nln = Lst_FindFrom(missingFiles, Lst_SuccS(ln),
 						   path_match, p);
 				tp = Lst_DatumS(ln);
 				Lst_RemoveS(missingFiles, ln);
 				free(tp);
 			    } while ((ln = nln) != NULL);
 @@ -1380,27 +1380,27 @@ meta_oodate(GNode *gn, Boolean oodate)
 #endif
 		    /* FALLTHROUGH */
 		case 'W':		/* Write */
 		check_write:
 		    /*
 		     * If a file we generated within our bailiwick
 		     * but outside of .OBJDIR is missing,
 		     * we need to do it again.
 		     */
 		    /* ignore non-absolute paths */
 		    if (*p != '/')
 			break;
-		    if (Lst_IsEmpty(metaBailiwick))
+		    if (Lst_IsEmptyS(metaBailiwick))
 			break;
 		    /* ignore cwd - normal dependencies handle those */
 		    if (strncmp(p, cwd, cwdlen) == 0)
 			break;
 		    if (!Lst_ForEachS(metaBailiwick, prefix_match, p))
 			break;
 		    /* tmpdir might be within */
 		    if (tmplen > 0 && strncmp(p, tmpdir, tmplen) == 0)
 			break;
 @@ -1585,27 +1585,27 @@ meta_oodate(GNode *gn, Boolean oodate)
 			fprintf(debug_file, "%s: %d: there are extra build commands now that weren't in the meta data file\n", fname, lineno);
 		    oodate = TRUE;
+		}
 		CHECK_VALID_META(p);
 		if (strcmp(p, cwd) != 0) {
 		    if (DEBUG(META))
 			fprintf(debug_file, "%s: %d: the current working directory has changed from '%s' to '%s'\n", fname, lineno, p, curdir);
 		    oodate = TRUE;
+		}
+	    }
+	}
 	fclose(fp);
-	if (!Lst_IsEmpty(missingFiles)) {
+	if (!Lst_IsEmptyS(missingFiles)) {
 	    if (DEBUG(META))
 		fprintf(debug_file, "%s: missing files: %s...\n",
 			fname, (char *)Lst_DatumS(Lst_First(missingFiles)));
 	    oodate = TRUE;
+	}
 	if (!oodate && !have_filemon && filemonMissing) {
 	    if (DEBUG(META))
 		fprintf(debug_file, "%s: missing filemon data\n", fname);
 	    oodate = TRUE;
+	}
     } else {
 	if (writeMeta && (metaMissing || (gn->type & OP_META))) {
 	    cp = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.266 2020/08/27 07:03:48 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.267 2020/08/27 19:15:35 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.266 2020/08/27 07:03:48 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.267 2020/08/27 19:15:35 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.266 2020/08/27 07:03:48 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.267 2020/08/27 19:15:35 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.
+ *
 @@ -842,27 +842,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))
+    if ((pgn->type & OP_DOUBLEDEP) && !Lst_IsEmptyS(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;
+}
 @@ -1350,27 +1350,27 @@ ParseDoDependency(char *line)
 		 *			main target.
 		 *  	.NOTPARALLEL	Make only one target at a time.
 		 *  	.SINGLESHELL	Create a shell for each command.
 		 *  	.ORDER	    	Must set initial predecessor to NULL
 		 */
 		switch (specType) {
 		case ExPath:
 		    if (paths == NULL) {
 			paths = Lst_Init();
+		    }
 		    Lst_AppendS(paths, dirSearchPath);
 		    break;
 		case Main:
-		    if (!Lst_IsEmpty(create)) {
+		    if (!Lst_IsEmptyS(create)) {
 			specType = Not;
+		    }
 		    break;
 		case Begin:
 		case End:
 		case Stale:
 		case dotError:
 		case Interrupt:
 		    gn = Targ_FindNode(line, TARG_CREATE);
 		    if (doing_depend)
 			ParseMark(gn);
 		    gn->type |= OP_NOTMAIN|OP_SPECIAL;
 		    Lst_AppendS(targets, gn);
 @@ -1437,27 +1437,27 @@ ParseDoDependency(char *line)
 		Dir_Expand(line, emptyPath, curTargs);
 		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)) {
+	    while(!Lst_IsEmptyS(curTargs)) {
 		char *targName = Lst_DequeueS(curTargs);
 		if (!Suff_IsTransform (targName)) {
 		    gn = Targ_FindNode(targName, TARG_CREATE);
 		} else {
 		    gn = Suff_AddTransform(targName);
+		}
 		if (doing_depend)
 		    ParseMark(gn);
 		Lst_AppendS(targets, gn);
+	    }
 	} else if (specType == ExPath && *line != '.' && *line != '\0') {
 @@ -1490,27 +1490,27 @@ ParseDoDependency(char *line)
 		cp++;
+	    }
+	}
 	line = cp;
     } while (*line && (ParseIsEscaped(lstart, line) ||
 	(*line != '!' && *line != ':')));
     /*
      * Don't need the list of target names anymore...
      */
     Lst_FreeS(curTargs);
     curTargs = NULL;
-    if (!Lst_IsEmpty(targets)) {
+    if (targets != NULL && !Lst_IsEmptyS(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:
 		/*
 		 * These four create nodes on which to hang commands, so
 		 * targets shouldn't be empty...
 @@ -1715,27 +1715,27 @@ ParseDoDependency(char *line)
 		     */
 		    break;
+		}
+	    }
 	    if (*cp == LPAREN) {
 		sources = Lst_Init();
 		if (!Arch_ParseArchive(&line, sources, VAR_CMD)) {
 		    Parse_Error(PARSE_FATAL,
 				 "Error in source archive spec \"%s\"", line);
 		    goto out;
+		}
-		while (!Lst_IsEmpty(sources)) {
+		while (!Lst_IsEmptyS(sources)) {
 		    gn = Lst_DequeueS(sources);
 		    ParseDoSrc(tOp, gn->name);
+		}
 		Lst_FreeS(sources);
 		cp = line;
 	    } else {
 		if (*cp) {
 		    *cp = '\0';
 		    cp += 1;
+		}
 		ParseDoSrc(tOp, line);
+	    }
 @@ -2077,27 +2077,27 @@ ParseMaybeSubMake(const char *cmd)
  *	Always 0
+ *
  * Side Effects:
  *	A new element is added to the commands list of the node,
  *	and the node can be marked as a submake node if the command is
  *	determined to be that.
  */
 static int
 ParseAddCmd(void *gnp, void *cmd)
+{
     GNode *gn = (GNode *)gnp;
     /* Add to last (ie current) cohort for :: targets */
-    if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty(gn->cohorts))
+    if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmptyS(gn->cohorts))
 	gn = Lst_DatumS(Lst_LastS(gn->cohorts));
     /* if target already supplied, ignore commands */
     if (!(gn->type & OP_HAS_COMMANDS)) {
 	Lst_AppendS(gn->commands, cmd);
 	if (ParseMaybeSubMake(cmd))
 	    gn->type |= OP_SUBMAKE;
 	ParseMark(gn);
     } else {
 #ifdef notyet
 	/* XXX: We cannot do this until we fix the tree */
 	Lst_AppendS(gn->commands, cmd);
 	Parse_Error(PARSE_WARNING,
 @@ -2129,27 +2129,27 @@ ParseAddCmd(void *gnp, void *cmd)
+ *
  * Results:
  *	None
+ *
  * Side Effects:
  *	OP_HAS_COMMANDS may be set for the target.
+ *
  *-----------------------------------------------------------------------
  */
 static void
 ParseHasCommands(void *gnp)
+{
     GNode *gn = (GNode *)gnp;
-    if (!Lst_IsEmpty(gn->commands)) {
+    if (!Lst_IsEmptyS(gn->commands)) {
 	gn->type |= OP_HAS_COMMANDS;
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Parse_AddIncludeDir --
  *	Add a directory to the path searched for included makefiles
  *	bracketed by double-quotes. Used by functions in main.c
+ *
  * Input:
  *	dir		The name of the directory to add
+ *
 @@ -2252,27 +2252,27 @@ Parse_include_file(char *file, Boolean i
 		if (fullname == NULL) {
 		    fullname = Dir_FindFile(file, dirSearchPath);
+		}
+	    }
+	}
+    }
     /* Looking for a system file or file still not found */
     if (fullname == NULL) {
 	/*
 	 * Look for it on the system path
 	 */
 	fullname = Dir_FindFile(file,
-		    Lst_IsEmpty(sysIncPath) ? defIncPath : sysIncPath);
+		    Lst_IsEmptyS(sysIncPath) ? defIncPath : sysIncPath);
+    }
     if (fullname == NULL) {
 	if (!silent)
 	    Parse_Error(PARSE_FATAL, "Could not find %s", file);
 	return;
+    }
     /* Actually open the file... */
     fd = open(fullname, O_RDONLY);
     if (fd == -1) {
 	if (!silent)
 	    Parse_Error(PARSE_FATAL, "Cannot open %s", fullname);
 @@ -2739,27 +2739,27 @@ ParseEOF(void)
     /* Ensure the makefile (or loop) didn't have mismatched conditionals */
     Cond_restore_depth(curFile->cond_depth);
     if (curFile->lf != NULL) {
 	    loadedfile_destroy(curFile->lf);
 	    curFile->lf = NULL;
+    }
     /* Dispose of curFile info */
     /* Leak curFile->fname because all the gnodes have pointers to it */
     free(curFile->P_str);
     free(curFile);
-    if (Lst_IsEmpty(includes)) {
+    if (Lst_IsEmptyS(includes)) {
 	curFile = NULL;
 	/* We've run out of input */
 	Var_Delete(".PARSEDIR", VAR_GLOBAL);
 	Var_Delete(".PARSEFILE", VAR_GLOBAL);
 	Var_Delete(".INCLUDEDFROMDIR", VAR_GLOBAL);
 	Var_Delete(".INCLUDEDFROMFILE", VAR_GLOBAL);
 	return DONE;
+    }
     curFile = Lst_DequeueS(includes);
     if (DEBUG(PARSE))
 	fprintf(debug_file, "ParseEOF: returning to file %s, line %d\n",
 	    curFile->fname, curFile->lineno);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.120 2020/08/27 07:03:48 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.121 2020/08/27 19:15:35 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.120 2020/08/27 07:03:48 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.121 2020/08/27 19:15:35 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.120 2020/08/27 07:03:48 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.121 2020/08/27 19:15:35 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
 @@ -219,27 +219,26 @@ static int SuffSuffIsSuffixP(const void
 static int SuffSuffHasNameP(const void *, const void *);
 static int SuffSuffIsPrefix(const void *, const void *);
 static int SuffGNHasNameP(const void *, const void *);
 static void SuffUnRef(void *, void *);
 static void SuffFree(void *);
 static void SuffInsert(Lst, Suff *);
 static void SuffRemove(Lst, Suff *);
 static Boolean SuffParseTransform(char *, Suff **, Suff **);
 static int SuffRebuildGraph(void *, void *);
 static int SuffScanTargets(void *, void *);
 static int SuffAddSrc(void *, void *);
 static int SuffRemoveSrc(Lst);
 static void SuffAddLevel(Lst, Src *);
 static Src *SuffFindThem(Lst, Lst);
 static Src *SuffFindCmds(Src *, Lst);
 static void SuffExpandChildren(LstNode, GNode *);
 static void SuffExpandWildcards(LstNode, GNode *);
 static Boolean SuffApplyTransform(GNode *, GNode *, Suff *, Suff *);
 static void SuffFindDeps(GNode *, Lst);
 static void SuffFindArchiveDeps(GNode *, Lst);
 static void SuffFindNormalDeps(GNode *, Lst);
 static int SuffPrintName(void *, void *);
 static int SuffPrintSuff(void *, void *);
 static int SuffPrintTrans(void *, void *);
 	/*************** Lst Predicates ****************/
 /*-
 @@ -765,30 +764,30 @@ Suff_AddTransform(char *line)
  *	=== 0
+ *
  * Side Effects:
  *	If the node has no commands or children, the children and parents
  *	lists of the affected suffixes are altered.
+ *
  *-----------------------------------------------------------------------
  */
 int
 Suff_EndTransform(void *gnp, void *dummy MAKE_ATTR_UNUSED)
+{
     GNode *gn = (GNode *)gnp;
-    if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty(gn->cohorts))
+    if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmptyS(gn->cohorts))
 	gn = Lst_DatumS(Lst_LastS(gn->cohorts));
-    if ((gn->type & OP_TRANSFORM) && Lst_IsEmpty(gn->commands) &&
+    if ((gn->type & OP_TRANSFORM) && Lst_IsEmptyS(gn->commands) &&
-	Lst_IsEmpty(gn->children))
+	Lst_IsEmptyS(gn->children))
+    {
 	Suff	*s, *t;
 	/*
 	 * SuffParseTransform() may fail for special rules which are not
 	 * actual transformation rules. (e.g. .DEFAULT)
 	 */
 	if (SuffParseTransform(gn->name, &s, &t)) {
 	    Lst	 p;
 	    if (DEBUG(SUFF)) {
 		fprintf(debug_file, "deleting transformation from `%s' to `%s'\n",
 		s->name, t->name);
 @@ -1061,27 +1060,27 @@ Suff_DoPaths(void)
     Suff	   	*s;
     LstNode  		ln;
     char		*ptr;
     Lst	    	    	inIncludes; /* Cumulative .INCLUDES path */
     Lst	    	    	inLibs;	    /* Cumulative .LIBS path */
     inIncludes = Lst_Init();
     inLibs = Lst_Init();
     Lst_OpenS(sufflist);
     while ((ln = Lst_NextS(sufflist)) != NULL) {
 	s = Lst_DatumS(ln);
-	if (!Lst_IsEmpty (s->searchPath)) {
+	if (!Lst_IsEmptyS(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_DestroyS(s->searchPath, Dir_Destroy);
 @@ -1344,27 +1343,27 @@ SuffRemoveSrc(Lst l)
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 static Src *
 SuffFindThem(Lst srcs, Lst slst)
+{
     Src            *s;		/* current Src */
     Src		   *rs;		/* returned Src */
     char	   *ptr;
     rs = NULL;
-    while (!Lst_IsEmpty (srcs)) {
+    while (!Lst_IsEmptyS(srcs)) {
 	s = Lst_DequeueS(srcs);
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "\ttrying %s...", s->file);
+	}
 	/*
 	 * A file is considered to exist if either a node exists in the
 	 * graph for it or the file actually exists.
 	 */
 	if (Targ_FindNode(s->file, TARG_NOCREATE) != NULL) {
 #ifdef DEBUG_SRC
 	    fprintf(debug_file, "remove %p from %p\n", s, srcs);
 @@ -1427,27 +1426,27 @@ SuffFindCmds(Src *targ, Lst slst)
     t = targ->node;
     Lst_OpenS(t->children);
     prefLen = strlen(targ->pref);
     for (;;) {
 	ln = Lst_NextS(t->children);
 	if (ln == NULL) {
 	    Lst_CloseS(t->children);
 	    return NULL;
+	}
 	s = Lst_DatumS(ln);
-	if (s->type & OP_OPTIONAL && Lst_IsEmpty(t->commands)) {
+	if (s->type & OP_OPTIONAL && Lst_IsEmptyS(t->commands)) {
 	    /*
 	     * We haven't looked to see if .OPTIONAL files exist yet, so
 	     * don't use one as the implicit source.
 	     * This allows us to use .OPTIONAL in .depend files so make won't
 	     * complain "don't know how to make xxx.h' when a dependent file
 	     * has been moved/deleted.
 	     */
 	    continue;
+	}
 	cp = strrchr(s->name, '/');
 	if (cp == NULL) {
 	    cp = s->name;
 @@ -1521,27 +1520,27 @@ SuffFindCmds(Src *targ, Lst slst)
  *	The expanded node is removed from the parent's list of children,
  *	and the parent's unmade counter is decremented, but other nodes
  * 	may be added.
+ *
  *-----------------------------------------------------------------------
  */
 static void
 SuffExpandChildren(LstNode cln, GNode *pgn)
+{
     GNode   	*cgn = Lst_DatumS(cln);
     GNode	*gn;	    /* New source 8) */
     char	*cp;	    /* Expanded value */
-    if (!Lst_IsEmpty(cgn->order_pred) || !Lst_IsEmpty(cgn->order_succ))
+    if (!Lst_IsEmptyS(cgn->order_pred) || !Lst_IsEmptyS(cgn->order_succ))
 	/* It is all too hard to process the result of .ORDER */
 	return;
     if (cgn->type & OP_WAIT)
 	/* Ignore these (& OP_PHONY ?) */
 	return;
     /*
      * First do variable expansion -- this takes precedence over
      * wildcard expansion. If the result contains wildcards, they'll be gotten
      * to later since the resulting words are tacked on to the end of
      * the children list.
      */
 @@ -1628,27 +1627,27 @@ SuffExpandChildren(LstNode cln, GNode *p
 		gn = Targ_FindNode(start, TARG_CREATE);
 		Lst_AppendS(members, gn);
+	    }
 	    /*
 	     * Point cp back at the beginning again so the variable value
 	     * can be freed.
 	     */
 	    cp = initcp;
+	}
 	/*
 	 * Add all elements of the members list to the parent node.
 	 */
-	while(!Lst_IsEmpty(members)) {
+	while(!Lst_IsEmptyS(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_FreeS(members);
 @@ -1678,27 +1677,27 @@ SuffExpandWildcards(LstNode cln, GNode *
     GNode	*gn;	    /* New source 8) */
     char	*cp;	    /* Expanded value */
     Lst 	explist;    /* List of expansions */
     if (!Dir_HasWildcards(cgn->name))
 	return;
     /*
      * Expand the word along the chosen path
      */
     explist = Lst_Init();
     Dir_Expand(cgn->name, Suff_FindPath(cgn), explist);
-    while (!Lst_IsEmpty(explist)) {
+    while (!Lst_IsEmptyS(explist)) {
 	/*
 	 * Fetch next expansion off the list and find its 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);
 @@ -2129,74 +2128,74 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
 		 */
 		Lst_AppendS(targs, targ);
 		/*
 		 * Search from this suffix's successor...
 		 */
 		ln = Lst_SuccS(ln);
+	    }
+	}
 	/*
 	 * Handle target of unknown suffix...
 	 */
-	if (Lst_IsEmpty(targs) && suffNull != NULL) {
+	if (Lst_IsEmptyS(targs) && suffNull != NULL) {
 	    if (DEBUG(SUFF)) {
 		fprintf(debug_file, "\tNo known suffix on %s. Using .NULL suffix\n", gn->name);
+	    }
 	    targ = bmake_malloc(sizeof(Src));
 	    targ->file = bmake_strdup(gn->name);
 	    targ->suff = suffNull;
 	    targ->suff->refCount++;
 	    targ->node = gn;
 	    targ->parent = NULL;
 	    targ->children = 0;
 	    targ->pref = bmake_strdup(sopref);
 #ifdef DEBUG_SRC
 	    targ->cp = Lst_Init();
 #endif
 	    /*
 	     * Only use the default suffix rules if we don't have commands
 	     * defined for this gnode; traditional make programs used to
 	     * not define suffix rules if the gnode had children but we
 	     * don't do this anymore.
 	     */
-	    if (Lst_IsEmpty(gn->commands))
+	    if (Lst_IsEmptyS(gn->commands))
 		SuffAddLevel(srcs, targ);
 	    else {
 		if (DEBUG(SUFF))
 		    fprintf(debug_file, "not ");
+	    }
 	    if (DEBUG(SUFF))
 		fprintf(debug_file, "adding suffix rules\n");
 	    Lst_AppendS(targs, targ);
+	}
 	/*
 	 * Using the list of possible sources built up from the target
 	 * suffix(es), try and find an existing file/target that matches.
 	 */
 	bottom = SuffFindThem(srcs, slst);
 	if (bottom == NULL) {
 	    /*
 	     * No known transformations -- use the first suffix found
 	     * for setting the local variables.
 	     */
-	    if (!Lst_IsEmpty(targs)) {
+	    if (!Lst_IsEmptyS(targs)) {
 		targ = Lst_DatumS(Lst_First(targs));
 	    } else {
 		targ = NULL;
+	    }
 	} else {
 	    /*
 	     * Work up the transformation path to find the suffix of the
 	     * target to which the transformation was made.
 	     */
 	    for (targ = bottom; targ->parent != NULL; targ = targ->parent)
 		continue;
+	}
+    }
 @@ -2283,27 +2282,27 @@ sfnd_abort:
+    }
     /*
      * If the suffix indicates that the target is a library, mark that in
      * the node's type field.
      */
     if (targ->suff->flags & SUFF_LIBRARY) {
 	gn->type |= OP_LIB;
+    }
     /*
      * Check for overriding transformation rule implied by sources
      */
-    if (!Lst_IsEmpty(gn->children)) {
+    if (!Lst_IsEmptyS(gn->children)) {
 	src = SuffFindCmds(targ, slst);
 	if (src != NULL) {
 	    /*
 	     * Free up all the Src structures in the transformation path
 	     * up to, but not including, the parent node.
 	     */
 	    while (bottom && bottom->parent != NULL) {
 		if (Lst_MemberS(slst, bottom) == NULL) {
 		    Lst_AppendS(slst, bottom);
+		}
 		bottom = bottom->parent;
+	    }

 @@ -1,14 +1,14 @@
-/*	$NetBSD: targ.c,v 1.74 2020/08/27 06:53:57 rillig Exp $	*/
+/*	$NetBSD: targ.c,v 1.75 2020/08/27 19:15:35 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: targ.c,v 1.74 2020/08/27 06:53:57 rillig Exp $";
+static char rcsid[] = "$NetBSD: targ.c,v 1.75 2020/08/27 19:15:35 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)targ.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: targ.c,v 1.74 2020/08/27 06:53:57 rillig Exp $");
+__RCSID("$NetBSD: targ.c,v 1.75 2020/08/27 19:15:35 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * targ.c --
  *	Functions for maintaining the Lst allTargets. Target nodes are
  * kept in two structures: a Lst, maintained by the list library, and a
  * hash table, maintained by the hash library.
+ *
  * Interface:
  *	Targ_Init 	    	Initialization procedure.
+ *
 @@ -650,46 +650,46 @@ Targ_PrintNode(void *gnp, void *passp)
+	    }
 	    if (! (gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC))) {
 		if (gn->mtime != 0) {
 		    fprintf(debug_file, "# last modified %s: %s\n",
 			      Targ_FmtTime(gn->mtime),
 			      made_name(gn->made));
 		} else if (gn->made != UNMADE) {
 		    fprintf(debug_file, "# non-existent (maybe): %s\n",
 			      made_name(gn->made));
 		} else {
 		    fprintf(debug_file, "# unmade\n");
+		}
+	    }
-	    if (!Lst_IsEmpty (gn->iParents)) {
+	    if (!Lst_IsEmptyS(gn->iParents)) {
 		fprintf(debug_file, "# implicit parents: ");
 		Lst_ForEachS(gn->iParents, TargPrintName, NULL);
 		fprintf(debug_file, "\n");
+	    }
 	} else {
 	    if (gn->unmade)
 		fprintf(debug_file, "# %d unmade children\n", gn->unmade);
+	}
-	if (!Lst_IsEmpty (gn->parents)) {
+	if (!Lst_IsEmptyS(gn->parents)) {
 	    fprintf(debug_file, "# parents: ");
 	    Lst_ForEachS(gn->parents, TargPrintName, NULL);
 	    fprintf(debug_file, "\n");
+	}
-	if (!Lst_IsEmpty (gn->order_pred)) {
+	if (!Lst_IsEmptyS(gn->order_pred)) {
 	    fprintf(debug_file, "# order_pred: ");
 	    Lst_ForEachS(gn->order_pred, TargPrintName, NULL);
 	    fprintf(debug_file, "\n");
+	}
-	if (!Lst_IsEmpty (gn->order_succ)) {
+	if (!Lst_IsEmptyS(gn->order_succ)) {
 	    fprintf(debug_file, "# order_succ: ");
 	    Lst_ForEachS(gn->order_succ, TargPrintName, NULL);
 	    fprintf(debug_file, "\n");
+	}
 	fprintf(debug_file, "%-16s", gn->name);
 	switch (gn->type & OP_OPMASK) {
 	    case OP_DEPENDS:
 		fprintf(debug_file, ": "); break;
 	    case OP_FORCE:
 		fprintf(debug_file, "! "); break;
 	    case OP_DOUBLEDEP:
 		fprintf(debug_file, ":: "); break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lst.h,v 1.48 2020/08/27 07:00:29 rillig Exp $	*/
+/*	$NetBSD: lst.h,v 1.49 2020/08/27 19:15:35 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.
 @@ -96,27 +96,26 @@ typedef int LstFindProc(const void *, co
 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_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);