 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.366 2020/10/04 19:36:32 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.367 2020/10/05 17:33:21 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.
 @@ -112,27 +112,27 @@
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 #include "trace.h"
 #ifdef USE_IOVEC
 #include <sys/uio.h>
 #endif
 /*	"@(#)main.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: main.c,v 1.366 2020/10/04 19:36:32 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.367 2020/10/05 17:33:21 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
 StringList *		create;		/* Targets to be made */
 time_t			now;		/* Time at start of make */
 GNode			*DEFAULT;	/* .DEFAULT node */
 @@ -963,52 +963,106 @@ InitVarTargets(void)
 	StringListNode *ln;
 	if (Lst_IsEmpty(create)) {
 		Var_Set(".TARGETS", "", VAR_GLOBAL);
 		return;
+	}
 	for (ln = create->first; ln != NULL; ln = ln->next) {
 		char *name = ln->datum;
 		Var_Append(".TARGETS", name, VAR_GLOBAL);
+	}
+}
 static const char *
 init_machine(const struct utsname *utsname)
+{
 	const char *machine = getenv("MACHINE");
 	if (machine != NULL)
 		return machine;
 #ifdef MAKE_NATIVE
 	return utsname->machine;
 #else
 #ifdef MAKE_MACHINE
 	return MAKE_MACHINE;
 #else
 	return "unknown";
 #endif
 #endif
+}
 static const char *
 init_machine_arch(void)
+{
 	const char *env = getenv("MACHINE_ARCH");
 	if (env != NULL)
 		return env;
 #ifdef MAKE_NATIVE
+	{
 		struct utsname utsname;
 		static char machine_arch_buf[sizeof(utsname.machine)];
 		const int mib[2] = { CTL_HW, HW_MACHINE_ARCH };
 		size_t len = sizeof(machine_arch_buf);
 		if (sysctl(mib, __arraycount(mib), machine_arch_buf,
 			&len, NULL, 0) < 0) {
 		    (void)fprintf(stderr, "%s: sysctl failed (%s).\n", progname,
 			strerror(errno));
 		    exit(2);
+		}
 		return machine_arch_buf;
+	}
 #else
 #ifndef MACHINE_ARCH
 #ifdef MAKE_MACHINE_ARCH
 	return MAKE_MACHINE_ARCH;
 #else
 	return "unknown";
 #endif
 #else
 	return MACHINE_ARCH;
 #endif
 #endif
+}
 /*-
  * 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 sb, sa;
 	char *p1, *path;
 	char mdpath[MAXPATHLEN];
-	const char *machine = getenv("MACHINE");
+	const char *machine;
-	const char *machine_arch = getenv("MACHINE_ARCH");
+	const char *machine_arch;
 	char *syspath = getenv("MAKESYSPATH");
 	StringList *sysMkPath;		/* Path of sys.mk */
 	char *cp = NULL, *start;
 					/* avoid faults on read-only strings */
 	static char defsyspath[] = _PATH_DEFSYSPATH;
 	char found_path[MAXPATHLEN + 1];	/* for searching for sys.mk */
 	struct timeval rightnow;		/* to initialize random seed */
 	struct utsname utsname;
 	/* default to writing debug to stderr */
 	debug_file = stderr;
 #ifdef SIGINFO
 @@ -1043,64 +1097,28 @@ main(int argc, char **argv)
 	    (void)fprintf(stderr, "%s: uname failed (%s).\n", progname,
 		strerror(errno));
 	    exit(2);
+	}
 	/*
 	 * Get the name of this type of MACHINE from utsname
 	 * so we can share an executable for similar machines.
 	 * (i.e. m68k: amiga hp300, mac68k, sun3, ...)
+	 *
 	 * Note that both MACHINE and MACHINE_ARCH are decided at
 	 * run-time.
 	 */
-	if (!machine) {
+	machine = init_machine(&utsname);
-#ifdef MAKE_NATIVE
+	machine_arch = init_machine_arch();
 	    machine = utsname.machine;
 #else
 #ifdef MAKE_MACHINE
 	    machine = MAKE_MACHINE;
 #else
 	    machine = "unknown";
 #endif
 #endif
 	if (!machine_arch) {
 #ifdef MAKE_NATIVE
 	    static char machine_arch_buf[sizeof(utsname.machine)];
 	    const int mib[2] = { CTL_HW, HW_MACHINE_ARCH };
 	    size_t len = sizeof(machine_arch_buf);
 	    if (sysctl(mib, __arraycount(mib), machine_arch_buf,
 		    &len, NULL, 0) < 0) {
 		(void)fprintf(stderr, "%s: sysctl failed (%s).\n", progname,
 		    strerror(errno));
 		exit(2);
 	    machine_arch = machine_arch_buf;
 #else
 #ifndef MACHINE_ARCH
 #ifdef MAKE_MACHINE_ARCH
 	    machine_arch = MAKE_MACHINE_ARCH;
 #else
 	    machine_arch = "unknown";
 #endif
 #else
 	    machine_arch = MACHINE_ARCH;
 #endif
 #endif
 	myPid = getpid();		/* remember this for vFork() */
 	/*
 	 * Just in case MAKEOBJDIR wants us to do something tricky.
 	 */
 	Var_Init();		/* Initialize the lists of variables for
 				 * parsing arguments */
 	Var_Set(".MAKE.OS", utsname.sysname, VAR_GLOBAL);
 	Var_Set("MACHINE", machine, VAR_GLOBAL);
 	Var_Set("MACHINE_ARCH", machine_arch, VAR_GLOBAL);
 #ifdef MAKE_VERSION
 	Var_Set("MAKE_VERSION", MAKE_VERSION, VAR_GLOBAL);