 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.407 2020/10/27 18:16:19 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.408 2020/10/27 19:16:46 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.407 2020/10/27 18:16:19 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.408 2020/10/27 19:16:46 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 */
 @@ -1184,26 +1184,58 @@ 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 */
+}
 static void
 InitMaxJobs(void)
+{
 	char *value;
 	int n;
 	if (forceJobs || opts.compatMake ||
 	    !Var_Exists(".MAKE.JOBS", VAR_GLOBAL))
 		return;
 	(void)Var_Subst("${.MAKE.JOBS}", VAR_GLOBAL, VARE_WANTRES, &value);
 	/* TODO: handle errors */
 	n = (int)strtol(value, NULL, 0);
 	if (n < 1) {
 		(void)fprintf(stderr,
 			      "%s: illegal value for .MAKE.JOBS "
 			      "-- must be positive integer!\n",
 			      progname);
 		exit(1);
+	}
 	if (n != opts.maxJobs) {
 		Var_Append(MAKEFLAGS, "-j", VAR_GLOBAL);
 		Var_Append(MAKEFLAGS, value, VAR_GLOBAL);
+	}
 	opts.maxJobs = n;
 	maxJobTokens = opts.maxJobs;
 	forceJobs = TRUE;
 	free(value);
+}
 /*
  * 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;
 @@ -1505,48 +1537,27 @@ main(int argc, char **argv)
 		(void)ReadMakefile(makeDependfile);
 		doing_depend = FALSE;
+	    }
+	}
 	if (enterFlagObj)
 		printf("%s: Entering directory `%s'\n", progname, objdir);
 	MakeMode(NULL);
 	Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &p1), VAR_GLOBAL);
 	bmake_free(p1);
-	if (!forceJobs && !opts.compatMake &&
+	InitMaxJobs();
 	    Var_Exists(".MAKE.JOBS", VAR_GLOBAL)) {
 	    char *value;
 	    int n;
 	    (void)Var_Subst("${.MAKE.JOBS}", VAR_GLOBAL, VARE_WANTRES, &value);
 	    /* TODO: handle errors */
 	    n = (int)strtol(value, NULL, 0);
 	    if (n < 1) {
 		(void)fprintf(stderr, "%s: illegal value for .MAKE.JOBS -- must be positive integer!\n",
 		    progname);
 		exit(1);
 	    if (n != opts.maxJobs) {
 		Var_Append(MAKEFLAGS, "-j", VAR_GLOBAL);
 		Var_Append(MAKEFLAGS, value, VAR_GLOBAL);
 	    opts.maxJobs = n;
 	    maxJobTokens = opts.maxJobs;
 	    forceJobs = TRUE;
 	    free(value);
 	/*
 	 * Be compatible if user did not specify -j and did not explicitly
 	 * turned compatibility on
 	 */
 	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);