 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.424 2020/11/04 13:22:15 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.425 2020/11/04 13:29:42 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.424 2020/11/04 13:22:15 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.425 2020/11/04 13:29:42 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 */
 @@ -148,28 +148,26 @@ static void		usage(void) MAKE_ATTR_DEAD;
 static void		purge_cached_realpaths(void);
 static Boolean		ignorePWD;	/* if we use -C, PWD is meaningless */
 static char objdir[MAXPATHLEN + 1];	/* where we chdir'ed to */
 char curdir[MAXPATHLEN + 1];		/* Startup directory */
 char *progname;				/* the program name */
 char *makeDependfile;
 pid_t myPid;
 int makelevel;
 Boolean forceJobs = FALSE;
 static int errors = 0;
 extern SearchPath *parseIncPath;
 /*
  * For compatibility with the POSIX version of MAKEFLAGS that includes
  * all the options with out -, convert flags to -f -l -a -g -s.
  */
 static char *
 explode(const char *flags)
+{
     size_t len;
     char *nf, *st;
     const char *f;
     if (flags == NULL)
 	return NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.h,v 1.185 2020/11/04 13:22:15 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.186 2020/11/04 13:29:42 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.
 @@ -442,28 +442,33 @@ extern time_t	now;		/* The time at the s
  * expression are discarded.  If TRUE (only during variable assignments using
  * the ':=' assignment operator, in the top-level expansion), they are
  * preserved and possibly expanded later when the variable from the
  * subexpression has been defined.
+ *
  * Example for a ':=' assignment:
  *	CFLAGS = $(.INCLUDES)
  *	CFLAGS := -I.. $(CFLAGS)
  *	# If .INCLUDES (an undocumented special variable, by the way) is
  *	# still undefined, the updated CFLAGS becomes "-I.. $(.INCLUDES)".
  */
 extern Boolean preserveUndefined;
-extern SearchPath *sysIncPath;	/* The system include path. */
+/* Used for .include "...". */
-extern SearchPath *defSysIncPath; /* The default system include path. */
+extern SearchPath *parseIncPath;
 /* Used for .include <...>, for the built-in sys.mk and makefiles from the
  * command line arguments. */
 extern SearchPath *sysIncPath;
 /* The default for sysIncPath. */
 extern SearchPath *defSysIncPath;
 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())