 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.408 2020/10/27 19:16:46 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.409 2020/10/28 03:21:25 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.
 @@ -108,27 +108,27 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 #include "trace.h"
 /*	"@(#)main.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: main.c,v 1.408 2020/10/27 19:16:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.409 2020/10/28 03:21:25 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
 	    "The Regents of the University of California.  "
 	    "All rights reserved.");
 #endif
 #ifndef	DEFMAXLOCAL
 #define	DEFMAXLOCAL DEFMAXJOBS
 #endif
 CmdOpts opts;
 time_t			now;		/* Time at start of make */
 GNode			*DEFAULT;	/* .DEFAULT node */
 @@ -1131,70 +1131,70 @@ InitVarMake(const char *argv0)
 	if (argv0[0] != '/' && strchr(argv0, '/') != NULL) {
 		char pathbuf[MAXPATHLEN];
 		const char *abs = cached_realpath(argv0, pathbuf);
 		struct stat st;
 		if (abs != NULL && abs[0] == '/' && stat(make, &st) == 0)
 			make = abs;
+	}
 	Var_Set("MAKE", make, VAR_GLOBAL);
 	Var_Set(".MAKE", make, VAR_GLOBAL);
+}
 static void
-InitDefIncPath(char *syspath)
+InitDefSysIncPath(char *syspath)
+{
 	static char defsyspath[] = _PATH_DEFSYSPATH;
 	char *start, *cp;
 	/*
 	 * 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.
 	 */
 	/* XXX: mismatch: the -m option sets sysIncPath, not syspath */
 	if (syspath == NULL || syspath[0] == '\0')
 		syspath = defsyspath;
 	else
 		syspath = bmake_strdup(syspath);
 	for (start = syspath; *start != '\0'; start = cp) {
 		for (cp = start; *cp != '\0' && *cp != ':'; cp++)
 			continue;
 		if (*cp == ':') {
 			*cp++ = '\0';
+		}
 		/* look for magic parent directory search string */
 		if (strncmp(".../", start, 4) != 0) {
-			(void)Dir_AddDir(defIncPath, start);
+			(void)Dir_AddDir(defSysIncPath, start);
 		} else {
 			char *dir = Dir_FindHereOrAbove(curdir, start + 4);
 			if (dir != NULL) {
-				(void)Dir_AddDir(defIncPath, dir);
+				(void)Dir_AddDir(defSysIncPath, dir);
 				free(dir);
+			}
+		}
+	}
 	if (syspath != defsyspath)
 		free(syspath);
+}
 static void
 ReadBuiltinRules(void)
+{
 	StringList *sysMkPath = Lst_New();
 	Dir_Expand(_PATH_DEFSYSMK,
-		   Lst_IsEmpty(sysIncPath) ? defIncPath : sysIncPath,
+		   Lst_IsEmpty(sysIncPath) ? defSysIncPath : sysIncPath,
 		   sysMkPath);
 	if (Lst_IsEmpty(sysMkPath))
 		Fatal("%s: no system rules (%s).", progname, _PATH_DEFSYSMK);
 	if (!Lst_ForEachUntil(sysMkPath, ReadMakefileSucceeded, NULL))
 		Fatal("%s: cannot open %s.", progname,
 		      (char *)sysMkPath->first->datum);
 	/* XXX: sysMkPath is not freed */
+}
 static void
 InitMaxJobs(void)
+{
 	char *value;
 @@ -1505,27 +1505,27 @@ main(int argc, char **argv)
 	 */
 	Arch_Init();
 	Targ_Init();
 	Suff_Init();
 	Trace_Init(tracefile);
 	DEFAULT = NULL;
 	(void)time(&now);
 	Trace_Log(MAKESTART, NULL);
 	InitVarTargets();
-	InitDefIncPath(syspath);
+	InitDefSysIncPath(syspath);
 	/*
 	 * Read in the built-in rules first, followed by the specified
 	 * makefiles, or the default makefile and Makefile, in that order,
 	 * if no makefiles were given on the command line.
 	 */
 	if (!opts.noBuiltins)
 		ReadBuiltinRules();
 	ReadMakefiles();
 	/* In particular suppress .depend for '-r -V .OBJDIR -f /dev/null' */
 	if (!opts.noBuiltins || !opts.printVars) {
 	    /* ignore /dev/null and anything starting with "no" */
 @@ -1624,29 +1624,31 @@ ReadMakefile(const char *fname)
 			path = str_concat3(objdir, "/", fname);
 			fd = open(path, O_RDONLY);
 			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)
+		if (!name) {
-			name = Dir_FindFile(fname,
+			SearchPath *sysInc = Lst_IsEmpty(sysIncPath)
-				Lst_IsEmpty(sysIncPath) ? defIncPath : sysIncPath);
+					     ? defSysIncPath : sysIncPath;
 			name = Dir_FindFile(fname, sysInc);
+		}
 		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: parse.c,v 1.408 2020/10/28 03:12:54 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.409 2020/10/28 03:21:25 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.
 @@ -107,27 +107,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.408 2020/10/28 03:12:54 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.409 2020/10/28 03:21:25 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
     char *fname;		/* name of file */
     Boolean fromForLoop;	/* simulated .include by the .for loop */
     int lineno;			/* current line number in file */
     int first_lineno;		/* line number of start of text */
     unsigned int cond_depth;	/* 'if' nesting when file opened */
     Boolean depending;		/* state of doing_depend on EOF */
 @@ -270,30 +270,30 @@ static Vector /* of IFile */ includes;
 static IFile *
 GetInclude(size_t i)
+{
     return Vector_Get(&includes, i);
+}
 /* The file that is currently being read. */
 static IFile *
 CurFile(void)
+{
     return GetInclude(includes.len - 1);
+}
-/* include paths (lists of directories) */
+/* include paths */
 SearchPath *parseIncPath;	/* dirs for "..." includes */
 SearchPath *sysIncPath;		/* dirs for <...> includes */
-SearchPath *defIncPath;		/* default for sysIncPath */
+SearchPath *defSysIncPath;		/* default for sysIncPath */
 /* parser tables */
 /*
  * The parseKeywords table is searched using binary search when deciding
  * if a target or source is special. The 'spec' field is the ParseSpecial
  * type of the keyword (SP_NOT if the keyword isn't special as a target) while
  * the 'op' field is the operator to apply to the list of targets if the
  * keyword is used as a source ("0" if the keyword isn't special as a source)
  */
 static const struct {
     const char   *name;		/* Name of keyword */
     ParseSpecial  spec;		/* Type when used as a target */
 @@ -2196,27 +2196,27 @@ Parse_include_file(char *file, Boolean i
 		fullname = Dir_FindFile(file, parseIncPath);
 		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
 	 */
-	SearchPath *path = Lst_IsEmpty(sysIncPath) ? defIncPath : sysIncPath;
+	SearchPath *path = Lst_IsEmpty(sysIncPath) ? defSysIncPath : sysIncPath;
 	fullname = Dir_FindFile(file, path);
+    }
     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)
 @@ -3134,41 +3134,41 @@ Parse_File(const char *name, int fd)
 		      progname);
 	PrintOnError(NULL, NULL);
 	exit(1);
+    }
+}
 /* Initialize the parsing module. */
 void
 Parse_Init(void)
+{
     mainNode = NULL;
     parseIncPath = Lst_New();
     sysIncPath = Lst_New();
-    defIncPath = Lst_New();
+    defSysIncPath = Lst_New();
     Vector_Init(&includes, sizeof(IFile));
 #ifdef CLEANUP
     targCmds = Lst_New();
 #endif
+}
 /* Clean up the parsing module. */
 void
 Parse_End(void)
+{
 #ifdef CLEANUP
     Lst_Destroy(targCmds, free);
     assert(targets == NULL);
-    Lst_Destroy(defIncPath, Dir_Destroy);
+    Lst_Destroy(defSysIncPath, Dir_Destroy);
     Lst_Destroy(sysIncPath, Dir_Destroy);
     Lst_Destroy(parseIncPath, Dir_Destroy);
     assert(includes.len == 0);
     Vector_Done(&includes);
 #endif
+}
 /*-
  *-----------------------------------------------------------------------
  * Parse_MainName --
  *	Return a Lst of the main target to create for main()'s sake. If
  *	no such target exists, we Punt with an obnoxious error message.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.h,v 1.174 2020/10/27 07:03:55 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.175 2020/10/28 03:21:25 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.
 @@ -437,27 +437,27 @@ extern GNode    *VAR_GLOBAL;	/* Variable
 				 * in the Makefile itself */
 extern GNode    *VAR_CMD;	/* Variables defined on the command line */
 extern char	var_Error[];	/* Value returned by Var_Parse when an error
 				 * is encountered. It actually points to
 				 * an empty string, so naive callers needn't
 				 * worry about it. */
 extern time_t	now;		/* The time at the start of this whole
 				 * process */
 extern Boolean	oldVars;	/* Do old-style variable substitution */
 extern SearchPath *sysIncPath;	/* The system include path. */
-extern SearchPath *defIncPath;	/* The default include path. */
+extern SearchPath *defSysIncPath; /* The default system include path. */
 extern char	curdir[];	/* Startup directory */
 extern char	*progname;	/* The program name */
 extern char	*makeDependfile; /* .depend */
 extern char	**savedEnv;	 /* if we replaced environ this will be non-NULL */
 extern int	makelevel;
 /*
  * We cannot vfork() in a child of vfork().
  * Most systems do not enforce this but some do.
  */
 #define vFork() ((getpid() == myPid) ? vfork() : fork())