 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir.c,v 1.115 2020/08/27 19:15:35 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.116 2020/08/28 04:14:31 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.115 2020/08/27 19:15:35 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.116 2020/08/28 04:14:31 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.115 2020/08/27 19:15:35 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.116 2020/08/28 04:14:31 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.
+ *
 @@ -473,27 +473,27 @@ Dir_End(void)
  * search, so we rebuild it after any .PATH: target.
  * This is the simplest way to deal with the effect of .DOTLAST.
  */
 void
 Dir_SetPATH(void)
+{
     LstNode ln;			/* a list element */
     Path *p;
     Boolean hasLastDot = FALSE;	/* true if we should search dot last */
     Var_Delete(".PATH", VAR_GLOBAL);
     Lst_OpenS(dirSearchPath);
-    if ((ln = Lst_First(dirSearchPath)) != NULL) {
+    if ((ln = Lst_FirstS(dirSearchPath)) != NULL) {
 	p = Lst_DatumS(ln);
 	if (p == dotLast) {
 	    hasLastDot = TRUE;
 	    Var_Append(".PATH", dotLast->name, VAR_GLOBAL);
+	}
+    }
     if (!hasLastDot) {
 	if (dot)
 	    Var_Append(".PATH", dot->name, VAR_GLOBAL);
 	if (cur)
 	    Var_Append(".PATH", cur->name, VAR_GLOBAL);
+    }
 @@ -1127,27 +1127,27 @@ Dir_FindFile(const char *name, Lst path)
 	hasSlash = FALSE;
 	cp = name;
+    }
     DIR_DEBUG1("Searching for %s ...", name);
     if (path == NULL) {
 	DIR_DEBUG0("couldn't open path, file not found\n");
 	misses += 1;
 	return NULL;
+    }
     Lst_OpenS(path);
-    if ((ln = Lst_First(path)) != NULL) {
+    if ((ln = Lst_FirstS(path)) != NULL) {
 	p = Lst_DatumS(ln);
 	if (p == dotLast) {
 	    hasLastDot = TRUE;
 	    DIR_DEBUG0("[dot last]...");
+	}
+    }
     DIR_DEBUG0("\n");
     /*
      * If there's no leading directory components or if the leading
      * directory component is exactly `./', consult the cached contents
      * of each of the directories on the search path.
      */
 @@ -1754,27 +1754,27 @@ Dir_ClearPath(Lst path)
  *	None
+ *
  * Side Effects:
  *	Reference counts for added dirs are upped.
+ *
  *-----------------------------------------------------------------------
  */
 void
 Dir_Concat(Lst path1, Lst path2)
+{
     LstNode ln;
     Path *p;
-    for (ln = Lst_First(path2); ln != NULL; ln = Lst_SuccS(ln)) {
+    for (ln = Lst_FirstS(path2); ln != NULL; ln = Lst_SuccS(ln)) {
 	p = Lst_DatumS(ln);
 	if (Lst_MemberS(path1, p) == NULL) {
 	    p->refCount += 1;
 	    Lst_AppendS(path1, p);
+	}
+    }
+}
 static int
 percentage(int num, int den)
+{
     return den != 0 ? num * 100 / den : 0;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: lst.c,v 1.47 2020/08/27 19:15:35 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.48 2020/08/28 04:14:31 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.47 2020/08/27 19:15:35 rillig Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.48 2020/08/28 04:14:31 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.47 2020/08/27 19:15:35 rillig Exp $");
+__RCSID("$NetBSD: lst.c,v 1.48 2020/08/28 04:14:31 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 */
 @@ -322,27 +322,27 @@ LstNode_SetNullS(LstNode node)
+{
     assert(LstNodeIsValid(node));
     node->datum = NULL;
+}
 /*
  * Node-specific functions
  */
 /* Return the first node from the given list, or NULL if the list is empty or
  * invalid. */
-LstNode
+static 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)
+{
 @@ -466,27 +466,27 @@ Lst_MemberS(Lst list, void *datum)
+    }
     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_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);
+    return Lst_ForEachFromS(list, Lst_FirstS(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_ForEachFromS(Lst list, LstNode node,
 		 LstActionProc proc, void *procData)
+{
     LstNode tln = node;
     LstNode next;
     Boolean done;
     int result;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lst.h,v 1.49 2020/08/27 19:15:35 rillig Exp $	*/
+/*	$NetBSD: lst.h,v 1.50 2020/08/28 04:14:31 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.
 @@ -121,27 +121,26 @@ void		Lst_AppendS(Lst, void *);
 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_SuccS(LstNode);
 /* Return predecessor to given element */
 LstNode		Lst_PrevS(LstNode);
 /* Get datum from LstNode */
 void		*Lst_DatumS(LstNode);
 /*
  * Functions for entire lists

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.317 2020/08/27 19:15:35 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.318 2020/08/28 04:14:31 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.317 2020/08/27 19:15:35 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.318 2020/08/28 04:14:31 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.317 2020/08/27 19:15:35 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.318 2020/08/28 04:14:31 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
 @@ -859,27 +859,27 @@ MakeMode(const char *mode)
 static void
 doPrintVars(void)
+{
 	LstNode ln;
 	Boolean expandVars;
 	if (printVars == EXPAND_VARS)
 		expandVars = TRUE;
 	else if (debugVflag)
 		expandVars = FALSE;
 	else
 		expandVars = getBoolean(".MAKE.EXPAND_VARIABLES", FALSE);
-	for (ln = Lst_First(variables); ln != NULL; ln = Lst_SuccS(ln)) {
+	for (ln = Lst_FirstS(variables); ln != NULL; ln = Lst_SuccS(ln)) {
 		char *var = Lst_DatumS(ln);
 		const char *value;
 		char *p1;
 		if (strchr(var, '$')) {
 			value = p1 = Var_Subst(var, VAR_GLOBAL, VARE_WANTRES);
 		} else if (expandVars) {
 			char tmp[128];
 			int len = snprintf(tmp, sizeof(tmp), "${%s}", var);
 			if (len >= (int)sizeof(tmp))
 				Fatal("%s: variable name too big: %s",
 				    progname, var);
 @@ -1268,27 +1268,27 @@ main(int argc, char **argv)
 	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_IsEmptyS(create)) {
 		LstNode ln;
-		for (ln = Lst_First(create); ln != NULL; ln = Lst_SuccS(ln)) {
+		for (ln = Lst_FirstS(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
 	 * as dir1:...:dirn) to the system include path.
 	 */
 	if (syspath == NULL || *syspath == '\0')

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.c,v 1.127 2020/08/27 19:15:35 rillig Exp $	*/
+/*	$NetBSD: make.c,v 1.128 2020/08/28 04:14:31 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.127 2020/08/27 19:15:35 rillig Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.128 2020/08/28 04:14:31 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.127 2020/08/27 19:15:35 rillig Exp $");
+__RCSID("$NetBSD: make.c,v 1.128 2020/08/28 04:14:31 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
 @@ -725,27 +725,27 @@ Make_Update(GNode *cgn)
      */
     if ((centurion = cgn->centurion) != NULL) {
 	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));
+    Lst_ForEachS(centurion->order_succ, MakeBuildParent, Lst_FirstS(toBeMade));
     /* Now mark all the parents as having one less unmade child */
     Lst_OpenS(parents);
     while ((ln = Lst_NextS(parents)) != NULL) {
 	pgn = Lst_DatumS(ln);
 	if (DEBUG(MAKE))
 	    fprintf(debug_file, "inspect parent %s%s: flags %x, "
 			"type %x, made %d, unmade %d ",
 		    pgn->name, pgn->cohort_num, pgn->flags,
 		    pgn->type, pgn->made, pgn->unmade-1);
 	if (!(pgn->flags & REMAKE)) {
 	    /* This parent isn't needed */
 @@ -1111,27 +1111,27 @@ MakeStartJobs(void)
 		fprintf(debug_file, "already checked %s%s\n",
 			gn->name, gn->cohort_num);
 	    gn->made = DEFERRED;
 	    continue;
+	}
 	gn->checked = checked;
 	if (gn->unmade != 0) {
 	    /*
 	     * We can't build this yet, add all unmade children to toBeMade,
 	     * just before the current first element.
 	     */
 	    gn->made = DEFERRED;
-	    Lst_ForEachS(gn->children, MakeBuildChild, Lst_First(toBeMade));
+	    Lst_ForEachS(gn->children, MakeBuildChild, Lst_FirstS(toBeMade));
 	    /* and drop this node on the floor */
 	    if (DEBUG(MAKE))
 		fprintf(debug_file, "dropped %s%s\n", gn->name, gn->cohort_num);
 	    continue;
+	}
 	gn->made = BEINGMADE;
 	if (Make_OODate(gn)) {
 	    if (DEBUG(MAKE)) {
 		fprintf(debug_file, "out-of-date\n");
+	    }
 	    if (queryFlag) {
 		return TRUE;
 @@ -1441,27 +1441,27 @@ Make_ProcessWait(Lst targs)
     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);
+	owln = Lst_FirstS(pgn->children);
 	Lst_OpenS(pgn->children);
 	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_ForEachFromS(pgn->children, owln, add_wait_dep, cgn);
 		owln = ln;
 	    } else {
 		Lst_AppendS(examine, cgn);
+	    }
+	}
 	Lst_CloseS(pgn->children);
+    }

 @@ -1,14 +1,14 @@
-/*      $NetBSD: meta.c,v 1.103 2020/08/27 19:15:35 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.104 2020/08/28 04:14:31 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:
 @@ -1157,27 +1157,27 @@ meta_oodate(GNode *gn, Boolean oodate)
 	    cwdlen = strlen(cwd);
+	}
 	strlcpy(lcwd, cwd, sizeof(lcwd));
 	strlcpy(latestdir, cwd, sizeof(latestdir));
 	if (!tmpdir) {
 	    tmpdir = getTmpdir();
 	    tmplen = strlen(tmpdir);
+	}
 	/* we want to track all the .meta we read */
 	Var_Append(".MAKE.META.FILES", fname, VAR_GLOBAL);
-	ln = Lst_First(gn->commands);
+	ln = Lst_FirstS(gn->commands);
 	while (!oodate && (x = fgetLine(&buf, &bufsz, 0, fp)) > 0) {
 	    lineno++;
 	    if (buf[x - 1] == '\n')
 		buf[x - 1] = '\0';
 	    else {
 		warnx("%s: %d: line truncated at %u", fname, lineno, x);
 		oodate = TRUE;
 		break;
+	    }
 	    link_src = NULL;
 	    move_target = NULL;
 	    /* Find the start of the build monitor section. */
 	    if (!have_filemon) {
 @@ -1588,27 +1588,27 @@ meta_oodate(GNode *gn, Boolean oodate)
 		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_IsEmptyS(missingFiles)) {
 	    if (DEBUG(META))
 		fprintf(debug_file, "%s: missing files: %s...\n",
-			fname, (char *)Lst_DatumS(Lst_First(missingFiles)));
+			fname, (char *)Lst_DatumS(Lst_FirstS(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;
 	    /* if target is in .CURDIR we do not need a meta file */
 	    if (gn->path && (cp = strrchr(gn->path, '/')) && cp > gn->path) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.122 2020/08/28 03:35:45 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.123 2020/08/28 04:14:31 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.122 2020/08/28 03:35:45 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.123 2020/08/28 04:14:31 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.122 2020/08/28 03:35:45 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.123 2020/08/28 04:14:31 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
 @@ -2052,27 +2052,27 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
     char    	*pref;	    /* Prefix to use */
     Src	    	*targ;	    /* General Src target pointer */
     SuffixCmpData sd;	    /* Search string data */
     sd.len = strlen(gn->name);
     sd.ename = eoname = gn->name + sd.len;
     sopref = gn->name;
     /*
      * Begin at the beginning...
      */
-    ln = Lst_First(sufflist);
+    ln = Lst_FirstS(sufflist);
     srcs = Lst_Init();
     targs = Lst_Init();
     /*
      * We're caught in a catch-22 here. On the one hand, we want to use any
      * transformation implied by the target's sources, but we can't examine
      * the sources until we've expanded any variables/wildcards they may hold,
      * and we can't do that until we've set up the target's local variables
      * and we can't do that until we know what the proper suffix for the
      * target is (in case there are two suffixes one of which is a suffix of
      * the other) and we can't know that until we've found its implied
      * source, which we may not want to use if there's an existing source
      * that implies a different transformation.
 @@ -2180,50 +2180,50 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
 	/*
 	 * 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_IsEmptyS(targs)) {
-		targ = Lst_DatumS(Lst_First(targs));
+		targ = Lst_DatumS(Lst_FirstS(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;
+	}
+    }
     Var_Set(TARGET, gn->path ? gn->path : gn->name, gn);
     pref = (targ != NULL) ? targ->pref : gn->name;
     Var_Set(PREFIX, pref, 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_SuccS(ln);
 	SuffExpandChildren(ln, gn);
+    }
     if (targ == NULL) {
 	if (DEBUG(SUFF)) {
 	    fprintf(debug_file, "\tNo valid suffix on %s\n", gn->name);
+	}
 sfnd_abort:
 	/*
 	 * Deal with finding the thing on the default search path. We
 	 * always do that, not only if the node is only a source (not