 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir.c,v 1.111 2020/08/26 22:55:46 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.112 2020/08/27 06:28:44 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.111 2020/08/26 22:55:46 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.112 2020/08/27 06:28:44 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.111 2020/08/26 22:55:46 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.112 2020/08/27 06:28:44 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.
+ *
 @@ -785,33 +785,32 @@ DirExpandCurly(const char *word, const c
  * Results:
  *	None.
+ *
  * Side Effects:
  *	Things are added to the expansions list.
+ *
  *-----------------------------------------------------------------------
  */
 static void
 DirExpandInt(const char *word, Lst path, Lst expansions)
+{
     LstNode ln;			/* Current node */
-    if (Lst_Open(path) == SUCCESS) {
+    Lst_OpenS(path);
-	while ((ln = Lst_NextS(path)) != NULL) {
+    while ((ln = Lst_NextS(path)) != NULL) {
-	    Path *p = Lst_DatumS(ln);
+	Path *p = Lst_DatumS(ln);
-	    DirMatchFiles(word, p, expansions);
+	DirMatchFiles(word, p, expansions);
 	Lst_CloseS(path);
+    }
     Lst_CloseS(path);
+}
 /* Print a word in the list of expansions.
  * Callback for Dir_Expand when DEBUG(DIR), via Lst_ForEach. */
 static int
 DirPrintWord(void *word, void *dummy MAKE_ATTR_UNUSED)
+{
     fprintf(debug_file, "%s ", (char *)word);
     return 0;
+}
 /*-
 @@ -830,26 +829,29 @@ DirPrintWord(void *word, void *dummy MAK
  *	A list of words consisting of the files which exist along the search
  *	path matching the given pattern.
+ *
  * Side Effects:
  *	Directories may be opened. Who knows?
  *	Undefined behavior if the word is really in read-only memory.
  *-----------------------------------------------------------------------
  */
 void
 Dir_Expand(const char *word, Lst path, Lst expansions)
+{
     const char *cp;
     assert(path != NULL);
     assert(expansions != NULL);
     DIR_DEBUG1("Expanding \"%s\"... ", word);
     cp = strchr(word, '{');
     if (cp) {
 	DirExpandCurly(word, cp, path, expansions);
     } else {
 	cp = strchr(word, '/');
 	if (cp) {
 	    /*
 	     * The thing has a directory component -- find the first wildcard
 	     * in the string.
 	     */
 	    for (cp = word; *cp; cp++) {
 @@ -1118,32 +1120,33 @@ Dir_FindFile(const char *name, Lst path)
      * slash in it (the name, I mean)
      */
     cp = strrchr(name, '/');
     if (cp) {
 	hasSlash = TRUE;
 	cp += 1;
     } else {
 	hasSlash = FALSE;
 	cp = name;
+    }
     DIR_DEBUG1("Searching for %s ...", name);
-    if (Lst_Open(path) == FAILURE) {
+    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) {
 	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.
 @@ -1650,27 +1653,28 @@ Dir_CopyDir(void *p)
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 char *
 Dir_MakeFlags(const char *flag, Lst path)
+{
     Buffer buf;
     LstNode ln;			/* the node of the current directory */
     Buf_Init(&buf, 0);
-    if (Lst_Open(path) == SUCCESS) {
+    if (path != NULL) {
 	Lst_OpenS(path);
 	while ((ln = Lst_NextS(path)) != NULL) {
 	    Path *p = Lst_DatumS(ln);
 	    Buf_AddStr(&buf, " ");
 	    Buf_AddStr(&buf, flag);
 	    Buf_AddStr(&buf, p->name);
+	}
 	Lst_CloseS(path);
+    }
     return Buf_Destroy(&buf, FALSE);
+}
 /*-
 @@ -1770,42 +1774,41 @@ Dir_Concat(Lst path1, Lst path2)
+}
 static int
 percentage(int num, int den)
+{
     return den != 0 ? num * 100 / den : 0;
+}
 /********** DEBUG INFO **********/
 void
 Dir_PrintDirectories(void)
+{
     LstNode ln;
     Path *p;
     fprintf(debug_file, "#*** Directory Cache:\n");
     fprintf(debug_file,
 	    "# Stats: %d hits %d misses %d near misses %d losers (%d%%)\n",
 	    hits, misses, nearmisses, bigmisses,
 	    percentage(hits, hits + bigmisses + nearmisses));
     fprintf(debug_file, "# %-20s referenced\thits\n", "directory");
     if (Lst_Open(openDirectories) == SUCCESS) {
-	while ((ln = Lst_NextS(openDirectories)) != NULL) {
+    Lst_OpenS(openDirectories);
-	    p = Lst_DatumS(ln);
+    while ((ln = Lst_NextS(openDirectories)) != NULL) {
-	    fprintf(debug_file, "# %-20s %10d\t%4d\n", p->name, p->refCount,
+	Path *p = Lst_DatumS(ln);
-		    p->hits);
+	fprintf(debug_file, "# %-20s %10d\t%4d\n", p->name, p->refCount,
 		p->hits);
 	Lst_CloseS(openDirectories);
+    }
     Lst_CloseS(openDirectories);
+}
 static int
 DirPrintDir(void *p, void *dummy MAKE_ATTR_UNUSED)
+{
     fprintf(debug_file, "%s ", ((Path *)p)->name);
     return 0;
+}
 void
 Dir_PrintPath(Lst path)
+{
     Lst_ForEach(path, DirPrintDir, NULL);

 @@ -1,14 +1,14 @@
-/* $NetBSD: lst.c,v 1.42 2020/08/26 22:55:46 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.43 2020/08/27 06:28:44 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.42 2020/08/26 22:55:46 rillig Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.43 2020/08/27 06:28:44 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.42 2020/08/26 22:55:46 rillig Exp $");
+__RCSID("$NetBSD: lst.c,v 1.43 2020/08/27 06:28:44 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 */
 @@ -627,38 +627,26 @@ Lst_AppendAllS(Lst dst, Lst src)
 /*
  * 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().
+ *
  * The sequential functions access the list in a slightly different way.
  * CurPtr points to their idea of the current node in the list and they
  * access the list based on it.
  */
 /* Open a list for sequential access. A list can still be searched, etc.,
  * without confusing these functions. */
 ReturnStatus
 Lst_Open(Lst list)
     if (!LstIsValid(list)) {
 	return FAILURE;
     Lst_OpenS(list);
     return SUCCESS;
 /* Open a list for sequential access. A list can still be searched, etc.,
  * without confusing these functions. */
 void
 Lst_OpenS(Lst list)
+{
     assert(LstIsValid(list));
     /* XXX: This assertion fails for NetBSD's "build.sh -j1 tools", somewhere
      * between "dependall ===> compat" and "dependall ===> binstall".
      * Building without the "-j1" succeeds though. */
     if (DEBUG(LINT) && list->isOpen)
 	Parse_Error(PARSE_WARNING, "Internal inconsistency: list opened twice");
     list->isOpen = TRUE;
     list->lastAccess = LstIsEmpty(list) ? Head : Unknown;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lst.h,v 1.45 2020/08/26 23:00:47 rillig Exp $	*/
+/*	$NetBSD: lst.h,v 1.46 2020/08/27 06:28:44 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.
 @@ -161,27 +161,26 @@ LstNode		Lst_FindFromS(Lst, LstNode, Lst
 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);
 /*
  * for using the list as a queue
  */
 /* Place an element at tail of queue */
 void		Lst_EnqueueS(Lst, void *);
 /* Remove an element from head of queue */
 void		*Lst_DequeueS(Lst);