 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.320 2020/08/28 04:48:57 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.321 2020/08/29 07:05:12 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.320 2020/08/28 04:48:57 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.321 2020/08/29 07:05:12 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.320 2020/08/28 04:48:57 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.321 2020/08/29 07:05:12 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
 @@ -775,35 +775,29 @@ Main_SetVarObjdir(const char *var, const
 	xpath = path;
 	xpath_freeIt = NULL;
 	if (strchr(path, '$') != 0)
 		xpath = xpath_freeIt = Var_Subst(path, VAR_GLOBAL,
 						 VARE_WANTRES);
 	(void)Main_SetObjdir("%s%s", xpath, suffix);
 	bmake_free(xpath_freeIt);
 	bmake_free(path_freeIt);
 	return TRUE;
+}
-/*-
+/* Return 0 if reading the makefile failed, for Lst_Find. */
  * ReadAllMakefiles --
  *	wrapper around ReadMakefile() to read all.
  * Results:
  *	TRUE if ok, FALSE on error
  */
 static int
-ReadAllMakefiles(const void *p, const void *q)
+ReadMakefileFailed(const void *p, const void *q)
+{
 	return ReadMakefile(p, q) == 0;
+}
 int
 str2Lst_Append(Lst lp, char *str, const char *sep)
+{
     char *cp;
     int n;
     if (!sep)
 	sep = " \t";
 @@ -1329,27 +1323,27 @@ main(int argc, char **argv)
 			   sysMkPath);
 		if (Lst_IsEmpty(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_Datum(ln));
+	}
 	if (!Lst_IsEmpty(makefiles)) {
 		LstNode ln;
-		ln = Lst_Find(makefiles, ReadAllMakefiles, NULL);
+		ln = Lst_Find(makefiles, ReadMakefileFailed, NULL);
 		if (ln != NULL)
 			Fatal("%s: cannot open %s.", progname,
 			    (char *)Lst_Datum(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);
+	    }
+	}
 @@ -1487,35 +1481,30 @@ main(int argc, char **argv)
 #endif
 	Suff_End();
 	Targ_End();
 	Arch_End();
 	Var_End();
 	Parse_End();
 	Dir_End();
 	Job_End();
 	Trace_End();
 	return outOfDate ? 1 : 0;
+}
-/*-
+/* Open and parse the given makefile, with all its side effects.
  * ReadMakefile  --
  *	Open and parse the given makefile.
+ *
  * Results:
  *	0 if ok. -1 if couldn't open file.
  * Side Effects:
  *	lots
  */
 static int
 ReadMakefile(const void *p, const void *q MAKE_ATTR_UNUSED)
+{
 	const char *fname = p;		/* makefile to read */
 	int fd;
 	char *name, *path = NULL;
 	if (!strcmp(fname, "-")) {
 		Parse_File(NULL /*stdin*/, -1);
 		Var_Set("MAKEFILE", "", VAR_INTERNAL);
 	} else {
 		/* if we've chdir'd, rebuild the path name */