 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.399 2020/10/27 07:38:08 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.400 2020/10/27 07:44:43 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.399 2020/10/27 07:38:08 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.400 2020/10/27 07:44:43 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 */
 @@ -1130,49 +1130,81 @@ ReadBuiltinRules(void)
+{
 	StringList *sysMkPath = Lst_New();
 	Dir_Expand(_PATH_DEFSYSMK,
 		   Lst_IsEmpty(sysIncPath) ? defIncPath : 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 */
+}
 /*
  * For compatibility, look at the directories in the VPATH variable
  * and add them to the search path, if the variable is defined. The
  * variable's value is in the same format as the PATH environment
  * variable, i.e. <directory>:<directory>:<directory>...
  */
 static void
 InitVpath(void)
+{
 	char *vpath, savec, *path;
 	if (!Var_Exists("VPATH", VAR_CMD))
 		return;
 	(void)Var_Subst("${VPATH}", VAR_CMD, VARE_WANTRES, &vpath);
 	/* TODO: handle errors */
 	path = vpath;
 	do {
 		char *cp;
 		/* skip to end of directory */
 		for (cp = path; *cp != ':' && *cp != '\0'; cp++)
 			continue;
 		/* Save terminator character so know when to stop */
 		savec = *cp;
 		*cp = '\0';
 		/* Add directory to search path */
 		(void)Dir_AddDir(dirSearchPath, path);
 		*cp = savec;
 		path = cp + 1;
 	} while (savec == ':');
 	free(vpath);
+}
 /*-
  * main --
  *	The main function, for obvious reasons. Initializes variables
  *	and a few modules, then parses the arguments give it in the
  *	environment and on the command line. Reads the system makefile
  *	followed by either Makefile, makefile or the file given by the
  *	-f argument. Sets the .MAKEFLAGS PMake variable based on all the
  *	flags it has received by then uses either the Make or the Compat
  *	module to create the initial list of targets.
+ *
  * Results:
  *	If -q was given, exits -1 if anything was out-of-date. Else it exits
  *	0.
+ *
  * Side Effects:
  *	The program exits when done. Targets are created. etc. etc. etc.
  */
 int
 main(int argc, char **argv)
+{
 	Boolean outOfDate;	/* FALSE if all targets up to date */
 	struct stat sa;
-	char *p1, *path;
+	char *p1;
 	char mdpath[MAXPATHLEN];
 	const char *machine;
 	const char *machine_arch;
 	char *syspath = getenv("MAKESYSPATH");
 	struct timeval rightnow;	/* to initialize random seed */
 	struct utsname utsname;
 	/* default to writing debug to stderr */
 	opts.debug_file = stderr;
 #ifdef SIGINFO
 	(void)bmake_signal(SIGINFO, siginfo);
 #endif
 @@ -1460,54 +1492,27 @@ main(int argc, char **argv)
 	 */
 	if (!opts.compatMake && !forceJobs) {
 	    opts.compatMake = TRUE;
+	}
 	if (!opts.compatMake)
 	    Job_ServerStart(maxJobTokens, jp_0, jp_1);
 	DEBUG5(JOB, "job_pipe %d %d, maxjobs %d, tokens %d, compat %d\n",
 	       jp_0, jp_1, opts.maxJobs, maxJobTokens, opts.compatMake ? 1 : 0);
 	if (!opts.printVars)
 	    Main_ExportMAKEFLAGS(TRUE);	/* initial export */
 	InitVpath();
 	/*
 	 * For compatibility, look at the directories in the VPATH variable
 	 * and add them to the search path, if the variable is defined. The
 	 * variable's value is in the same format as the PATH envariable, i.e.
 	 * <directory>:<directory>:<directory>...
 	 */
 	if (Var_Exists("VPATH", VAR_CMD)) {
 		char *vpath, savec;
 		(void)Var_Subst("${VPATH}", VAR_CMD, VARE_WANTRES, &vpath);
 		/* TODO: handle errors */
 		path = vpath;
 		do {
 			char *cp;
 			/* skip to end of directory */
 			for (cp = path; *cp != ':' && *cp != '\0'; cp++)
 				continue;
 			/* Save terminator character so know when to stop */
 			savec = *cp;
 			*cp = '\0';
 			/* Add directory to search path */
 			(void)Dir_AddDir(dirSearchPath, path);
 			*cp = savec;
 			path = cp + 1;
 		} while (savec == ':');
 		free(vpath);
 	/*
 	 * Now that all search paths have been read for suffixes et al, it's
 	 * time to add the default search path to their lists...
 	 */
 	Suff_DoPaths();
 	/*
 	 * Propagate attributes through :: dependency lists.
 	 */
 	Targ_Propagate();
 	/* print the initial graph, if the user requested it */