 @@ -1,2247 +1,2247 @@
-/*	$NetBSD: main.c,v 1.417 2020/10/31 09:35:58 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.418 2020/10/31 11:34:30 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Copyright (c) 1989 by Berkeley Softworks
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*-
  * main.c --
  *	The main file for this entire program. Exit routines etc
  *	reside here.
+ *
  * Utility functions defined in this file:
  *	Main_ParseArgLine	Takes a line of arguments, breaks them and
  *				treats them as if they were given when first
  *				invoked. Used by the parse module to implement
  *				the .MFLAGS target.
+ *
  *	Error			Print a tagged error message. The global
  *				MAKE variable must have been defined. This
  *				takes a format string and optional arguments
  *				for it.
+ *
  *	Fatal			Print an error message and exit. Also takes
  *				a format string and arguments for it.
+ *
  *	Punt			Aborts all jobs and exits with a message. Also
  *				takes a format string and arguments for it.
+ *
  *	Finish			Finish things up by printing the number of
  *				errors which occurred, as passed to it, and
  *				exiting.
  */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #ifdef MAKE_NATIVE
 #include <sys/sysctl.h>
 #endif
 #include <sys/utsname.h>
 #include <sys/wait.h>
 #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.417 2020/10/31 09:35:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.418 2020/10/31 11:34:30 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 */
 Boolean			allPrecious;	/* .PRECIOUS given on line by itself */
 Boolean			deleteOnError;	/* .DELETE_ON_ERROR: set */
 static int		maxJobTokens;	/* -j argument */
 Boolean			enterFlagObj;	/* -w and objdir != srcdir */
 Boolean			oldVars;	/* variable substitution style */
 static int jp_0 = -1, jp_1 = -1;	/* ends of parent job pipe */
 Boolean			doing_depend;	/* Set while reading .depend */
 static Boolean		jobsRunning;	/* TRUE if the jobs might be running */
 static const char *	tracefile;
 static int		ReadMakefile(const char *);
 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;
 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;
     for (f = flags; *f; f++)
 	if (!ch_isalpha(*f))
 	    break;
     if (*f)
 	return bmake_strdup(flags);
     len = strlen(flags);
     st = nf = bmake_malloc(len * 3 + 1);
     while (*flags) {
 	*nf++ = '-';
 	*nf++ = *flags++;
 	*nf++ = ' ';
+    }
     *nf = '\0';
     return st;
+}
 static void
 parse_debug_option_F(const char *modules)
+{
     const char *mode;
     size_t len;
     char *fname;
     if (opts.debug_file != stdout && opts.debug_file != stderr)
 	fclose(opts.debug_file);
     if (*modules == '+') {
 	modules++;
 	mode = "a";
     } else
 	mode = "w";
     if (strcmp(modules, "stdout") == 0) {
 	opts.debug_file = stdout;
 	return;
+    }
     if (strcmp(modules, "stderr") == 0) {
 	opts.debug_file = stderr;
 	return;
+    }
     len = strlen(modules);
     fname = bmake_malloc(len + 20);
     memcpy(fname, modules, len + 1);
     /* Let the filename be modified by the pid */
     if (strcmp(fname + len - 3, ".%d") == 0)
 	snprintf(fname + len - 2, 20, "%d", getpid());
     opts.debug_file = fopen(fname, mode);
     if (!opts.debug_file) {
 	fprintf(stderr, "Cannot open debug file %s\n",
 		fname);
 	usage();
+    }
     free(fname);
+}
 static void
 parse_debug_options(const char *argvalue)
+{
 	const char *modules;
 	for (modules = argvalue; *modules; ++modules) {
 		switch (*modules) {
 		case '0':	/* undocumented, only intended for tests */
 			opts.debug &= DEBUG_LINT;
 			break;
 		case 'A':
 			opts.debug = ~(0|DEBUG_LINT);
 			break;
 		case 'a':
 			opts.debug |= DEBUG_ARCH;
 			break;
 		case 'C':
 			opts.debug |= DEBUG_CWD;
 			break;
 		case 'c':
 			opts.debug |= DEBUG_COND;
 			break;
 		case 'd':
 			opts.debug |= DEBUG_DIR;
 			break;
 		case 'e':
 			opts.debug |= DEBUG_ERROR;
 			break;
 		case 'f':
 			opts.debug |= DEBUG_FOR;
 			break;
 		case 'g':
 			if (modules[1] == '1') {
 				opts.debug |= DEBUG_GRAPH1;
 				++modules;
+			}
 			else if (modules[1] == '2') {
 				opts.debug |= DEBUG_GRAPH2;
 				++modules;
+			}
 			else if (modules[1] == '3') {
 				opts.debug |= DEBUG_GRAPH3;
 				++modules;
+			}
 			break;
 		case 'h':
 			opts.debug |= DEBUG_HASH;
 			break;
 		case 'j':
 			opts.debug |= DEBUG_JOB;
 			break;
 		case 'L':
 			opts.debug |= DEBUG_LINT;
 			break;
 		case 'l':
 			opts.debug |= DEBUG_LOUD;
 			break;
 		case 'M':
 			opts.debug |= DEBUG_META;
 			break;
 		case 'm':
 			opts.debug |= DEBUG_MAKE;
 			break;
 		case 'n':
 			opts.debug |= DEBUG_SCRIPT;
 			break;
 		case 'p':
 			opts.debug |= DEBUG_PARSE;
 			break;
 		case 's':
 			opts.debug |= DEBUG_SUFF;
 			break;
 		case 't':
 			opts.debug |= DEBUG_TARG;
 			break;
 		case 'V':
 			opts.debugVflag = TRUE;
 			break;
 		case 'v':
 			opts.debug |= DEBUG_VAR;
 			break;
 		case 'x':
 			opts.debug |= DEBUG_SHELL;
 			break;
 		case 'F':
 			parse_debug_option_F(modules + 1);
 			goto debug_setbuf;
 		default:
 			(void)fprintf(stderr,
 			    "%s: illegal argument to d option -- %c\n",
 			    progname, *modules);
 			usage();
+		}
+	}
 debug_setbuf:
 	/*
 	 * Make the debug_file unbuffered, and make
 	 * stdout line buffered (unless debugfile == stdout).
 	 */
 	setvbuf(opts.debug_file, NULL, _IONBF, 0);
 	if (opts.debug_file != stdout) {
 		setvbuf(stdout, NULL, _IOLBF, 0);
+	}
+}
 /*
  * does path contain any relative components
  */
 static Boolean
 is_relpath(const char *path)
+{
 	const char *cp;
 	if (path[0] != '/')
 		return TRUE;
 	cp = path;
 	while ((cp = strstr(cp, "/.")) != NULL) {
 		cp += 2;
 		if (cp[0] == '/' || cp[0] == '\0')
 			return TRUE;
 		else if (cp[0] == '.') {
 			if (cp[1] == '/' || cp[1] == '\0')
 				return TRUE;
+		}
+	}
 	return FALSE;
+}
 static void
 MainParseArgChdir(const char *argvalue)
+{
 	struct stat sa, sb;
 	if (chdir(argvalue) == -1) {
 		(void)fprintf(stderr, "%s: chdir %s: %s\n",
 		    progname, argvalue, strerror(errno));
 		exit(1);
+	}
 	if (getcwd(curdir, MAXPATHLEN) == NULL) {
 		(void)fprintf(stderr, "%s: %s.\n", progname, strerror(errno));
 		exit(2);
+	}
 	if (!is_relpath(argvalue) &&
 	    stat(argvalue, &sa) != -1 &&
 	    stat(curdir, &sb) != -1 &&
 	    sa.st_ino == sb.st_ino &&
 	    sa.st_dev == sb.st_dev)
 		strncpy(curdir, argvalue, MAXPATHLEN);
 	ignorePWD = TRUE;
+}
 static void
 MainParseArgJobsInternal(const char *argvalue)
+{
 	if (sscanf(argvalue, "%d,%d", &jp_0, &jp_1) != 2) {
 		(void)fprintf(stderr,
 			      "%s: internal error -- J option malformed (%s)\n",
 			      progname, argvalue);
 		usage();
+	}
 	if ((fcntl(jp_0, F_GETFD, 0) < 0) ||
 	    (fcntl(jp_1, F_GETFD, 0) < 0)) {
 #if 0
 		(void)fprintf(stderr,
 		    "%s: ###### warning -- J descriptors were closed!\n",
 		    progname);
 		exit(2);
 #endif
 		jp_0 = -1;
 		jp_1 = -1;
 		opts.compatMake = TRUE;
 	} else {
 		Var_Append(MAKEFLAGS, "-J", VAR_GLOBAL);
 		Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
+	}
+}
 static void
 MainParseArgJobs(const char *argvalue)
+{
 	char *p;
 	forceJobs = TRUE;
 	opts.maxJobs = (int)strtol(argvalue, &p, 0);
 	if (*p != '\0' || opts.maxJobs < 1) {
 		(void)fprintf(stderr,
 		    "%s: illegal argument to -j -- must be positive integer!\n",
 		    progname);
 		exit(1);	/* XXX: why not 2? */
+	}
 	Var_Append(MAKEFLAGS, "-j", VAR_GLOBAL);
 	Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
 	Var_Set(".MAKE.JOBS", argvalue, VAR_GLOBAL);
 	maxJobTokens = opts.maxJobs;
+}
 static void
 MainParseArgSysInc(const char *argvalue)
+{
 	/* look for magic parent directory search string */
 	if (strncmp(".../", argvalue, 4) == 0) {
 		char *found_path = Dir_FindHereOrAbove(curdir, argvalue + 4);
 		if (found_path == NULL)
 			return;
 		(void)Dir_AddDir(sysIncPath, found_path);
 		free(found_path);
 	} else {
 		(void)Dir_AddDir(sysIncPath, argvalue);
+	}
 	Var_Append(MAKEFLAGS, "-m", VAR_GLOBAL);
 	Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
+}
 static Boolean
 MainParseArg(char c, const char *argvalue)
+{
 	switch (c) {
 	case '\0':
 		break;
 	case 'B':
 		opts.compatMake = TRUE;
 		Var_Append(MAKEFLAGS, "-B", VAR_GLOBAL);
 		Var_Set(MAKE_MODE, "compat", VAR_GLOBAL);
 		break;
 	case 'C':
 		MainParseArgChdir(argvalue);
 		break;
 	case 'D':
 		if (argvalue[0] == '\0') return FALSE;
 		Var_Set(argvalue, "1", VAR_GLOBAL);
 		Var_Append(MAKEFLAGS, "-D", VAR_GLOBAL);
 		Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
 		break;
 	case 'I':
 		Parse_AddIncludeDir(argvalue);
 		Var_Append(MAKEFLAGS, "-I", VAR_GLOBAL);
 		Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
 		break;
 	case 'J':
 		MainParseArgJobsInternal(argvalue);
 		break;
 	case 'N':
 		opts.noExecute = TRUE;
 		opts.noRecursiveExecute = TRUE;
 		Var_Append(MAKEFLAGS, "-N", VAR_GLOBAL);
 		break;
 	case 'S':
 		opts.keepgoing = FALSE;
 		Var_Append(MAKEFLAGS, "-S", VAR_GLOBAL);
 		break;
 	case 'T':
 		tracefile = bmake_strdup(argvalue);
 		Var_Append(MAKEFLAGS, "-T", VAR_GLOBAL);
 		Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
 		break;
 	case 'V':
 	case 'v':
 		opts.printVars = c == 'v' ? EXPAND_VARS : COMPAT_VARS;
 		Lst_Append(opts.variables, bmake_strdup(argvalue));
 		/* XXX: Why always -V? */
 		Var_Append(MAKEFLAGS, "-V", VAR_GLOBAL);
 		Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
 		break;
 	case 'W':
 		opts.parseWarnFatal = TRUE;
 		break;
 	case 'X':
 		opts.varNoExportEnv = TRUE;
 		Var_Append(MAKEFLAGS, "-X", VAR_GLOBAL);
 		break;
 	case 'd':
 		/* If '-d-opts' don't pass to children */
 		if (argvalue[0] == '-')
 			argvalue++;
 		else {
 			Var_Append(MAKEFLAGS, "-d", VAR_GLOBAL);
 			Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
+		}
 		parse_debug_options(argvalue);
 		break;
 	case 'e':
 		opts.checkEnvFirst = TRUE;
 		Var_Append(MAKEFLAGS, "-e", VAR_GLOBAL);
 		break;
 	case 'f':
 		Lst_Append(opts.makefiles, bmake_strdup(argvalue));
 		break;
 	case 'i':
 		opts.ignoreErrors = TRUE;
 		Var_Append(MAKEFLAGS, "-i", VAR_GLOBAL);
 		break;
 	case 'j':
 		MainParseArgJobs(argvalue);
 		break;
 	case 'k':
 		opts.keepgoing = TRUE;
 		Var_Append(MAKEFLAGS, "-k", VAR_GLOBAL);
 		break;
 	case 'm':
 		MainParseArgSysInc(argvalue);
 		break;
 	case 'n':
 		opts.noExecute = TRUE;
 		Var_Append(MAKEFLAGS, "-n", VAR_GLOBAL);
 		break;
 	case 'q':
 		opts.queryFlag = TRUE;
 		/* Kind of nonsensical, wot? */
 		Var_Append(MAKEFLAGS, "-q", VAR_GLOBAL);
 		break;
 	case 'r':
 		opts.noBuiltins = TRUE;
 		Var_Append(MAKEFLAGS, "-r", VAR_GLOBAL);
 		break;
 	case 's':
 		opts.beSilent = TRUE;
 		Var_Append(MAKEFLAGS, "-s", VAR_GLOBAL);
 		break;
 	case 't':
 		opts.touchFlag = TRUE;
 		Var_Append(MAKEFLAGS, "-t", VAR_GLOBAL);
 		break;
 	case 'w':
 		opts.enterFlag = TRUE;
 		Var_Append(MAKEFLAGS, "-w", VAR_GLOBAL);
 		break;
 	default:
 	case '?':
 		usage();
+	}
 	return TRUE;
+}
 /* Parse the given arguments.  Called from main() and from
  * Main_ParseArgLine() when the .MAKEFLAGS target is used.
+ *
  * The arguments must be treated as read-only and will be freed after the
  * call.
+ *
  * XXX: Deal with command line overriding .MAKEFLAGS in makefile */
 static void
 MainParseArgs(int argc, char **argv)
+{
 	char c;
 	int arginc;
 	char *argvalue;
 	char *optscan;
 	Boolean inOption, dashDash = FALSE;
 	const char *optspecs = "BC:D:I:J:NST:V:WXd:ef:ij:km:nqrstv:w";
 /* Can't actually use getopt(3) because rescanning is not portable */
 rearg:
 	inOption = FALSE;
 	optscan = NULL;
 	while (argc > 1) {
 		const char *optspec;
 		if (!inOption)
 			optscan = argv[1];
 		c = *optscan++;
 		arginc = 0;
 		if (inOption) {
 			if (c == '\0') {
 				++argv;
 				--argc;
 				inOption = FALSE;
 				continue;
+			}
 		} else {
 			if (c != '-' || dashDash)
 				break;
 			inOption = TRUE;
 			c = *optscan++;
+		}
 		/* '-' found at some earlier point */
 		optspec = strchr(optspecs, c);
 		if (c != '\0' && optspec != NULL && optspec[1] == ':') {
 			/* -<something> found, and <something> should have an arg */
 			inOption = FALSE;
 			arginc = 1;
 			argvalue = optscan;
 			if (*argvalue == '\0') {
 				if (argc < 3)
 					goto noarg;
 				argvalue = argv[2];
 				arginc = 2;
+			}
 		} else {
 			argvalue = NULL;
+		}
 		switch (c) {
 		case '\0':
 			arginc = 1;
 			inOption = FALSE;
 			break;
 		case '-':
 			dashDash = TRUE;
 			break;
 		default:
 			if (!MainParseArg(c, argvalue))
 				goto noarg;
+		}
 		argv += arginc;
 		argc -= arginc;
+	}
 	oldVars = TRUE;
 	/*
 	 * See if the rest of the arguments are variable assignments and
 	 * perform them if so. Else take them to be targets and stuff them
 	 * on the end of the "create" list.
 	 */
 	for (; argc > 1; ++argv, --argc) {
 		VarAssign var;
 		if (Parse_IsVar(argv[1], &var)) {
 			Parse_DoVar(&var, VAR_CMDLINE);
 		} else {
 			if (!*argv[1])
 				Punt("illegal (null) argument.");
 			if (*argv[1] == '-' && !dashDash)
 				goto rearg;
 			Lst_Append(opts.create, bmake_strdup(argv[1]));
+		}
+	}
 	return;
 noarg:
 	(void)fprintf(stderr, "%s: option requires an argument -- %c\n",
 	    progname, c);
 	usage();
+}
 /* Break a line of arguments into words and parse them.
+ *
  * Used when a .MFLAGS or .MAKEFLAGS target is encountered during parsing and
  * by main() when reading the MAKEFLAGS environment variable. */
 void
 Main_ParseArgLine(const char *line)
+{
 	Words words;
 	void *p1;
 	const char *argv0 = Var_Value(".MAKE", VAR_GLOBAL, &p1);
 	char *buf;
 	if (line == NULL)
 		return;
 	for (; *line == ' '; ++line)
 		continue;
 	if (!*line)
 		return;
 	buf = str_concat3(argv0, " ", line);
 	free(p1);
 	words = Str_Words(buf, TRUE);
 	if (words.words == NULL) {
 		Error("Unterminated quoted string [%s]", buf);
 		free(buf);
 		return;
+	}
 	free(buf);
 	MainParseArgs((int)words.len, words.words);
 	Words_Free(words);
+}
 Boolean
 Main_SetObjdir(const char *fmt, ...)
+{
 	struct stat sb;
 	char *path;
 	char buf[MAXPATHLEN + 1];
 	char buf2[MAXPATHLEN + 1];
 	Boolean rc = FALSE;
 	va_list ap;
 	va_start(ap, fmt);
 	vsnprintf(path = buf, MAXPATHLEN, fmt, ap);
 	va_end(ap);
 	if (path[0] != '/') {
 		snprintf(buf2, MAXPATHLEN, "%s/%s", curdir, path);
 		path = buf2;
+	}
 	/* look for the directory and try to chdir there */
 	if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) {
 		if (access(path, W_OK) || chdir(path)) {
 			(void)fprintf(stderr, "make warning: %s: %s.\n",
 				      path, strerror(errno));
 		} else {
 			snprintf(objdir, sizeof objdir, "%s", path);
 			Var_Set(".OBJDIR", objdir, VAR_GLOBAL);
 			setenv("PWD", objdir, 1);
 			Dir_InitDot();
 			purge_cached_realpaths();
 			rc = TRUE;
 			if (opts.enterFlag && strcmp(objdir, curdir) != 0)
 				enterFlagObj = TRUE;
+		}
+	}
 	return rc;
+}
 static Boolean
 Main_SetVarObjdir(const char *var, const char *suffix)
+{
 	void *path_freeIt;
 	const char *path = Var_Value(var, VAR_CMDLINE, &path_freeIt);
 	const char *xpath;
 	char *xpath_freeIt;
 	if (path == NULL || path[0] == '\0') {
 		bmake_free(path_freeIt);
 		return FALSE;
+	}
 	/* expand variable substitutions */
 	xpath = path;
 	xpath_freeIt = NULL;
 	if (strchr(path, '$') != 0) {
 		(void)Var_Subst(path, VAR_GLOBAL, VARE_WANTRES, &xpath_freeIt);
 		/* TODO: handle errors */
 		xpath = xpath_freeIt;
+	}
 	(void)Main_SetObjdir("%s%s", xpath, suffix);
 	bmake_free(xpath_freeIt);
 	bmake_free(path_freeIt);
 	return TRUE;
+}
 /* Read and parse the makefile.
  * Return TRUE if reading the makefile succeeded. */
 static int
 ReadMakefileSucceeded(void *fname, void *unused)
+{
 	return ReadMakefile(fname) == 0;
+}
 int
 str2Lst_Append(StringList *lp, char *str, const char *sep)
+{
     char *cp;
     int n;
     if (!sep)
 	sep = " \t";
     for (n = 0, cp = strtok(str, sep); cp; cp = strtok(NULL, sep)) {
 	Lst_Append(lp, cp);
 	n++;
+    }
     return n;
+}
 #ifdef SIGINFO
 /*ARGSUSED*/
 static void
 siginfo(int signo MAKE_ATTR_UNUSED)
+{
 	char dir[MAXPATHLEN];
 	char str[2 * MAXPATHLEN];
 	int len;
 	if (getcwd(dir, sizeof(dir)) == NULL)
 		return;
 	len = snprintf(str, sizeof(str), "%s: Working in: %s\n", progname, dir);
 	if (len > 0)
 		(void)write(STDERR_FILENO, str, (size_t)len);
+}
 #endif
 /*
  * Allow makefiles some control over the mode we run in.
  */
 void
 MakeMode(const char *mode)
+{
     char *mode_freeIt = NULL;
     if (mode == NULL) {
 	(void)Var_Subst("${" MAKE_MODE ":tl}",
 		  VAR_GLOBAL, VARE_WANTRES, &mode_freeIt);
 	/* TODO: handle errors */
 	mode = mode_freeIt;
+    }
     if (mode[0] != '\0') {
 	if (strstr(mode, "compat")) {
 	    opts.compatMake = TRUE;
 	    forceJobs = FALSE;
+	}
 #if USE_META
 	if (strstr(mode, "meta"))
 	    meta_mode_init(mode);
 #endif
+    }
     free(mode_freeIt);
+}
 static void
 PrintVar(const char *varname, Boolean expandVars)
+{
 	if (strchr(varname, '$')) {
 		char *evalue;
 		(void)Var_Subst(varname, VAR_GLOBAL, VARE_WANTRES, &evalue);
 		/* TODO: handle errors */
 		printf("%s\n", evalue);
 		bmake_free(evalue);
 	} else if (expandVars) {
 		char *expr = str_concat3("${", varname, "}");
 		char *evalue;
 		(void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &evalue);
 		/* TODO: handle errors */
 		free(expr);
 		printf("%s\n", evalue);
 		bmake_free(evalue);
 	} else {
 		void *freeIt;
 		const char *value = Var_Value(varname, VAR_GLOBAL, &freeIt);
 		printf("%s\n", value ? value : "");
 		bmake_free(freeIt);
+	}
+}
 static void
 doPrintVars(void)
+{
 	StringListNode *ln;
 	Boolean expandVars;
 	if (opts.printVars == EXPAND_VARS)
 		expandVars = TRUE;
 	else if (opts.debugVflag)
 		expandVars = FALSE;
 	else
 		expandVars = getBoolean(".MAKE.EXPAND_VARIABLES", FALSE);
 	for (ln = opts.variables->first; ln != NULL; ln = ln->next) {
 		const char *varname = ln->datum;
 		PrintVar(varname, expandVars);
+	}
+}
 static Boolean
 runTargets(void)
+{
 	GNodeList *targs; /* target nodes to create -- passed to Make_Init */
 	Boolean outOfDate;	/* FALSE if all targets up to date */
 	/*
 	 * Have now read the entire graph and need to make a list of
 	 * targets to create. If none was given on the command line,
 	 * we consult the parsing module to find the main target(s)
 	 * to create.
 	 */
 	if (Lst_IsEmpty(opts.create))
 		targs = Parse_MainName();
 	else
 		targs = Targ_FindList(opts.create);
 	if (!opts.compatMake) {
 		/*
 		 * Initialize job module before traversing the graph
 		 * now that any .BEGIN and .END targets have been read.
 		 * This is done only if the -q flag wasn't given
 		 * (to prevent the .BEGIN from being executed should
 		 * it exist).
 		 */
 		if (!opts.queryFlag) {
 			Job_Init();
 			jobsRunning = TRUE;
+		}
 		/* Traverse the graph, checking on all the targets */
 		outOfDate = Make_Run(targs);
 	} else {
 		/*
 		 * Compat_Init will take care of creating all the
 		 * targets as well as initializing the module.
 		 */
 		Compat_Run(targs);
 		outOfDate = FALSE;
+	}
 	Lst_Free(targs);
 	return outOfDate;
+}
 /*
  * Set up the .TARGETS variable to contain the list of targets to be
  * created. If none specified, make the variable empty -- the parser
  * will fill the thing in with the default or .MAIN target.
  */
 static void
 InitVarTargets(void)
+{
 	StringListNode *ln;
 	if (Lst_IsEmpty(opts.create)) {
 		Var_Set(".TARGETS", "", VAR_GLOBAL);
 		return;
+	}
 	for (ln = opts.create->first; ln != NULL; ln = ln->next) {
 		char *name = ln->datum;
 		Var_Append(".TARGETS", name, VAR_GLOBAL);
+	}
+}
 static void
 InitRandom(void)
+{
 	struct timeval tv;
 	gettimeofday(&tv, NULL);
 	srandom((unsigned int)(tv.tv_sec + tv.tv_usec));
+}
 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
+}
 #ifndef NO_PWD_OVERRIDE
 /*
  * All this code is so that we know where we are when we start up
  * on a different machine with pmake.
+ *
  * Overriding getcwd() with $PWD totally breaks MAKEOBJDIRPREFIX
  * since the value of curdir can vary depending on how we got
  * here.  Ie sitting at a shell prompt (shell that provides $PWD)
  * or via subdir.mk in which case its likely a shell which does
  * not provide it.
+ *
  * So, to stop it breaking this case only, we ignore PWD if
  * MAKEOBJDIRPREFIX is set or MAKEOBJDIR contains a variable expression.
  */
 static void
 HandlePWD(const struct stat *curdir_st)
+{
 	char *pwd;
 	void *prefix_freeIt, *makeobjdir_freeIt;
 	const char *makeobjdir;
 	struct stat pwd_st;
 	if (ignorePWD || (pwd = getenv("PWD")) == NULL)
 		return;
 	if (Var_Value("MAKEOBJDIRPREFIX", VAR_CMDLINE, &prefix_freeIt) != NULL) {
 		bmake_free(prefix_freeIt);
 		return;
+	}
 	makeobjdir = Var_Value("MAKEOBJDIR", VAR_CMDLINE, &makeobjdir_freeIt);
 	if (makeobjdir != NULL && strchr(makeobjdir, '$') != NULL)
 		goto ignore_pwd;
 	if (stat(pwd, &pwd_st) == 0 &&
 	    curdir_st->st_ino == pwd_st.st_ino &&
 	    curdir_st->st_dev == pwd_st.st_dev)
 		(void)strncpy(curdir, pwd, MAXPATHLEN);
 ignore_pwd:
 	bmake_free(makeobjdir_freeIt);
+}
 #endif
 /*
  * Find the .OBJDIR.  If MAKEOBJDIRPREFIX, or failing that,
  * MAKEOBJDIR is set in the environment, try only that value
  * and fall back to .CURDIR if it does not exist.
+ *
  * Otherwise, try _PATH_OBJDIR.MACHINE-MACHINE_ARCH, _PATH_OBJDIR.MACHINE,
  * and * finally _PATH_OBJDIRPREFIX`pwd`, in that order.  If none
  * of these paths exist, just use .CURDIR.
  */
 static void
 InitObjdir(const char *machine, const char *machine_arch)
+{
 	Dir_InitDir(curdir);
 	(void)Main_SetObjdir("%s", curdir);
 	if (!Main_SetVarObjdir("MAKEOBJDIRPREFIX", curdir) &&
 	    !Main_SetVarObjdir("MAKEOBJDIR", "") &&
 	    !Main_SetObjdir("%s.%s-%s", _PATH_OBJDIR, machine, machine_arch) &&
 	    !Main_SetObjdir("%s.%s", _PATH_OBJDIR, machine) &&
 	    !Main_SetObjdir("%s", _PATH_OBJDIR))
 		(void)Main_SetObjdir("%s%s", _PATH_OBJDIRPREFIX, curdir);
+}
 /* get rid of resource limit on file descriptors */
 static void
 UnlimitFiles(void)
+{
 #if defined(MAKE_NATIVE) || (defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE))
 	struct rlimit rl;
 	if (getrlimit(RLIMIT_NOFILE, &rl) != -1 &&
 	    rl.rlim_cur != rl.rlim_max) {
 		rl.rlim_cur = rl.rlim_max;
 		(void)setrlimit(RLIMIT_NOFILE, &rl);
+	}
 #endif
+}
 static void
 CmdOpts_Init(void)
+{
 	opts.compatMake = FALSE;	/* No compat mode */
 	opts.debug = 0;			/* No debug verbosity, please. */
 	/* opts.debug_file has been initialized earlier */
 	opts.debugVflag = FALSE;
 	opts.checkEnvFirst = FALSE;
 	opts.makefiles = Lst_New();
 	opts.ignoreErrors = FALSE;	/* Pay attention to non-zero returns */
 	opts.maxJobs = DEFMAXLOCAL;	/* Set default local max concurrency */
 	opts.keepgoing = FALSE;		/* Stop on error */
 	opts.noRecursiveExecute = FALSE; /* Execute all .MAKE targets */
 	opts.noExecute = FALSE;		/* Execute all commands */
 	opts.queryFlag = FALSE;		/* This is not just a check-run */
 	opts.noBuiltins = FALSE;	/* Read the built-in rules */
 	opts.beSilent = FALSE;		/* Print commands as executed */
 	opts.touchFlag = FALSE;		/* Actually update targets */
 	opts.printVars = 0;
 	opts.variables = Lst_New();
 	opts.parseWarnFatal = FALSE;
 	opts.enterFlag = FALSE;
 	opts.varNoExportEnv = FALSE;
 	opts.create = Lst_New();
+}
 /* Initialize MAKE and .MAKE to the path of the executable, so that it can be
  * found by execvp(3) and the shells, even after a chdir.
+ *
  * If it's a relative path and contains a '/', resolve it to an absolute path.
  * Otherwise keep it as is, assuming it will be found in the PATH. */
 static void
 InitVarMake(const char *argv0)
+{
 	const char *make = 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
 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(defSysIncPath, start);
 		} else {
 			char *dir = Dir_FindHereOrAbove(curdir, start + 4);
 			if (dir != NULL) {
 				(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) ? 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;
 	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_CMDLINE))
 		return;
 	(void)Var_Subst("${VPATH}", VAR_CMDLINE, 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);
+}
 static void
 ReadMakefiles(void)
+{
 	if (opts.makefiles->first != NULL) {
 		StringListNode *ln;
 		for (ln = opts.makefiles->first; ln != NULL; ln = ln->next) {
 			if (ReadMakefile(ln->datum) != 0)
 				Fatal("%s: cannot open %s.",
 				      progname, (char *)ln->datum);
+		}
 	} else {
 		char *p1;
 		(void)Var_Subst("${" MAKEFILE_PREFERENCE "}",
 				VAR_CMDLINE, VARE_WANTRES, &p1);
 		/* TODO: handle errors */
 		(void)str2Lst_Append(opts.makefiles, p1, NULL);
 		(void)Lst_ForEachUntil(opts.makefiles,
 				       ReadMakefileSucceeded, NULL);
 		free(p1);
+	}
+}
 static void
 CleanUp(void)
+{
 #ifdef CLEANUP
 	Lst_Destroy(opts.variables, free);
 	Lst_Free(opts.makefiles);	/* don't free, may be used in GNodes */
 	Lst_Destroy(opts.create, free);
 #endif
 	/* print the graph now it's been processed if the user requested it */
 	if (DEBUG(GRAPH2))
 		Targ_PrintGraph(2);
 	Trace_Log(MAKEEND, 0);
 	if (enterFlagObj)
 		printf("%s: Leaving directory `%s'\n", progname, objdir);
 	if (opts.enterFlag)
 		printf("%s: Leaving directory `%s'\n", progname, curdir);
 #ifdef USE_META
 	meta_finish();
 #endif
 	Suff_End();
 	Targ_End();
 	Arch_End();
 	Var_End();
 	Parse_End();
 	Dir_End();
 	Job_End();
 	Trace_End();
+}
 /*-
  * 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;
 	const char *machine;
 	const char *machine_arch;
 	char *syspath = getenv("MAKESYSPATH");
 	struct utsname utsname;
 	/* default to writing debug to stderr */
 	opts.debug_file = stderr;
 #ifdef SIGINFO
 	(void)bmake_signal(SIGINFO, siginfo);
 #endif
 	InitRandom();
 	if ((progname = strrchr(argv[0], '/')) != NULL)
 		progname++;
 	else
 		progname = argv[0];
 	UnlimitFiles();
 	if (uname(&utsname) == -1) {
 	    (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.
 	 */
 	machine = init_machine(&utsname);
 	machine_arch = init_machine_arch();
 	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);
 #endif
 	Var_Set(".newline", "\n", VAR_GLOBAL); /* handy for :@ loops */
 	/*
 	 * This is the traditional preference for makefiles.
 	 */
 #ifndef MAKEFILE_PREFERENCE_LIST
 # define MAKEFILE_PREFERENCE_LIST "makefile Makefile"
 #endif
 	Var_Set(MAKEFILE_PREFERENCE, MAKEFILE_PREFERENCE_LIST,
 		VAR_GLOBAL);
 	Var_Set(MAKE_DEPENDFILE, ".depend", VAR_GLOBAL);
 	CmdOpts_Init();
 	allPrecious = FALSE;		/* Remove targets when interrupted */
 	deleteOnError = FALSE;		/* Historical default behavior */
 	jobsRunning = FALSE;
 	maxJobTokens = opts.maxJobs;
 	ignorePWD = FALSE;
 	/*
 	 * Initialize the parsing, directory and variable modules to prepare
 	 * for the reading of inclusion paths and variable settings on the
 	 * command line
 	 */
 	/*
 	 * Initialize various variables.
 	 *	MAKE also gets this name, for compatibility
 	 *	.MAKEFLAGS gets set to the empty string just in case.
 	 *	MFLAGS also gets initialized empty, for compatibility.
 	 */
 	Parse_Init();
 	InitVarMake(argv[0]);
 	Var_Set(MAKEFLAGS, "", VAR_GLOBAL);
 	Var_Set(MAKEOVERRIDES, "", VAR_GLOBAL);
 	Var_Set("MFLAGS", "", VAR_GLOBAL);
 	Var_Set(".ALLTARGETS", "", VAR_GLOBAL);
 	/* some makefiles need to know this */
 	Var_Set(MAKE_LEVEL ".ENV", MAKE_LEVEL_ENV, VAR_CMDLINE);
 	/*
 	 * Set some other useful macros
 	 */
+	{
 	    char tmp[64], *ep;
 	    makelevel = ((ep = getenv(MAKE_LEVEL_ENV)) && *ep) ? atoi(ep) : 0;
 	    if (makelevel < 0)
 		makelevel = 0;
 	    snprintf(tmp, sizeof(tmp), "%d", makelevel);
 	    Var_Set(MAKE_LEVEL, tmp, VAR_GLOBAL);
 	    snprintf(tmp, sizeof(tmp), "%u", myPid);
 	    Var_Set(".MAKE.PID", tmp, VAR_GLOBAL);
 	    snprintf(tmp, sizeof(tmp), "%u", getppid());
 	    Var_Set(".MAKE.PPID", tmp, VAR_GLOBAL);
+	}
 	if (makelevel > 0) {
 		char pn[1024];
 		snprintf(pn, sizeof(pn), "%s[%d]", progname, makelevel);
 		progname = bmake_strdup(pn);
+	}
 #ifdef USE_META
 	meta_init();
 #endif
 	Dir_Init();
 	/*
 	 * First snag any flags out of the MAKE environment variable.
 	 * (Note this is *not* MAKEFLAGS since /bin/make uses that and it's
 	 * in a different format).
 	 */
 #ifdef POSIX
+	{
 	    char *p1 = explode(getenv("MAKEFLAGS"));
 	    Main_ParseArgLine(p1);
 	    free(p1);
+	}
 #else
 	Main_ParseArgLine(getenv("MAKE"));
 #endif
 	/*
 	 * Find where we are (now).
 	 * We take care of PWD for the automounter below...
 	 */
 	if (getcwd(curdir, MAXPATHLEN) == NULL) {
 		(void)fprintf(stderr, "%s: getcwd: %s.\n",
 		    progname, strerror(errno));
 		exit(2);
+	}
 	MainParseArgs(argc, argv);
 	if (opts.enterFlag)
 		printf("%s: Entering directory `%s'\n", progname, curdir);
 	/*
 	 * Verify that cwd is sane.
 	 */
 	if (stat(curdir, &sa) == -1) {
 	    (void)fprintf(stderr, "%s: %s: %s.\n",
 		 progname, curdir, strerror(errno));
 	    exit(2);
+	}
 #ifndef NO_PWD_OVERRIDE
 	HandlePWD(&sa);
 #endif
 	Var_Set(".CURDIR", curdir, VAR_GLOBAL);
 	InitObjdir(machine, machine_arch);
 	/*
 	 * Initialize archive, target and suffix modules in preparation for
 	 * parsing the makefile(s)
 	 */
 	Arch_Init();
 	Targ_Init();
 	Suff_Init();
 	Trace_Init(tracefile);
 	DEFAULT = NULL;
 	(void)time(&now);
 	Trace_Log(MAKESTART, NULL);
 	InitVarTargets();
 	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" */
 	    (void)Var_Subst("${.MAKE.DEPENDFILE:N/dev/null:Nno*:T}",
 			    VAR_CMDLINE, VARE_WANTRES, &makeDependfile);
 	    if (makeDependfile[0] != '\0') {
 		/* TODO: handle errors */
 		doing_depend = TRUE;
 		(void)ReadMakefile(makeDependfile);
 		doing_depend = FALSE;
+	    }
+	}
 	if (enterFlagObj)
 		printf("%s: Entering directory `%s'\n", progname, objdir);
 	MakeMode(NULL);
+	{
 	    void *freeIt;
 	    Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &freeIt),
 		       VAR_GLOBAL);
 	    bmake_free(freeIt);
+	}
 	InitMaxJobs();
 	/*
 	 * 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);
 	if (!opts.printVars)
 	    Main_ExportMAKEFLAGS(TRUE);	/* initial export */
 	InitVpath();
 	/*
 	 * 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 */
 	if (DEBUG(GRAPH1))
 		Targ_PrintGraph(1);
 	/* print the values of any variables requested by the user */
 	if (opts.printVars) {
 		doPrintVars();
 		outOfDate = FALSE;
 	} else {
 		outOfDate = runTargets();
+	}
 	CleanUp();
 	return outOfDate ? 1 : 0;
+}
 /* Open and parse the given makefile, with all its side effects.
+ *
  * Results:
  *	0 if ok. -1 if couldn't open file.
  */
 static int
 ReadMakefile(const char *fname)
+{
 	int fd;
 	char *name, *path = NULL;
 	if (!strcmp(fname, "-")) {
 		Parse_File(NULL /*stdin*/, -1);
 		Var_Set("MAKEFILE", "", VAR_INTERNAL);
 	} else {
 		/* if we've chdir'd, rebuild the path name */
 		if (strcmp(curdir, objdir) && *fname != '/') {
 			path = str_concat3(curdir, "/", fname);
 			fd = open(path, O_RDONLY);
 			if (fd != -1) {
 				fname = path;
 				goto found;
+			}
 			free(path);
 			/* If curdir failed, try objdir (ala .depend) */
 			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) {
 			SearchPath *sysInc = Lst_IsEmpty(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)
 			Var_Set("MAKEFILE", fname, VAR_INTERNAL);
 		Parse_File(fname, fd);
+	}
 	free(path);
 	return 0;
+}
 /*-
  * Cmd_Exec --
  *	Execute the command in cmd, and return the output of that command
  *	in a string.  In the output, newlines are replaced with spaces.
+ *
  * Results:
  *	A string containing the output of the command, or the empty string.
  *	*errfmt returns a format string describing the command failure,
  *	if any, using a single %s conversion specification.
+ *
  * Side Effects:
  *	The string must be freed by the caller.
  */
 char *
 Cmd_Exec(const char *cmd, const char **errfmt)
+{
     const char	*args[4];	/* Args for invoking the shell */
     int		fds[2];		/* Pipe streams */
     int		cpid;		/* Child PID */
     int		pid;		/* PID from wait() */
     int		status;		/* command exit status */
     Buffer	buf;		/* buffer to store the result */
     ssize_t	bytes_read;
     char	*res;		/* result */
     size_t	res_len;
     char	*cp;
     int		savederr;	/* saved errno */
     *errfmt = NULL;
     if (!shellName)
 	Shell_Init();
     /*
      * Set up arguments for shell
      */
     args[0] = shellName;
     args[1] = "-c";
     args[2] = cmd;
     args[3] = NULL;
     /*
      * Open a pipe for fetching its output
      */
     if (pipe(fds) == -1) {
 	*errfmt = "Couldn't create pipe for \"%s\"";
 	goto bad;
+    }
     /*
      * Fork
      */
     switch (cpid = vFork()) {
     case 0:
 	/*
 	 * Close input side of pipe
 	 */
 	(void)close(fds[0]);
 	/*
 	 * Duplicate the output stream to the shell's output, then
 	 * shut the extra thing down. Note we don't fetch the error
 	 * stream...why not? Why?
 	 */
 	(void)dup2(fds[1], 1);
 	(void)close(fds[1]);
 	Var_ExportVars();
 	(void)execv(shellPath, UNCONST(args));
 	_exit(1);
 	/*NOTREACHED*/
     case -1:
 	*errfmt = "Couldn't exec \"%s\"";
 	goto bad;
     default:
 	/*
 	 * No need for the writing half
 	 */
 	(void)close(fds[1]);
 	savederr = 0;
 	Buf_Init(&buf, 0);
 	do {
 	    char   result[BUFSIZ];
 	    bytes_read = read(fds[0], result, sizeof(result));
 	    if (bytes_read > 0)
 		Buf_AddBytes(&buf, result, (size_t)bytes_read);
+	}
 	while (bytes_read > 0 || (bytes_read == -1 && errno == EINTR));
 	if (bytes_read == -1)
 	    savederr = errno;
 	/*
 	 * Close the input side of the pipe.
 	 */
 	(void)close(fds[0]);
 	/*
 	 * Wait for the process to exit.
 	 */
 	while(((pid = waitpid(cpid, &status, 0)) != cpid) && (pid >= 0)) {
 	    JobReapChild(pid, status, FALSE);
 	    continue;
+	}
 	res_len = Buf_Len(&buf);
 	res = Buf_Destroy(&buf, FALSE);
 	if (savederr != 0)
 	    *errfmt = "Couldn't read shell's output for \"%s\"";
 	if (WIFSIGNALED(status))
 	    *errfmt = "\"%s\" exited on a signal";
 	else if (WEXITSTATUS(status) != 0)
 	    *errfmt = "\"%s\" returned non-zero status";
 	/* Convert newlines to spaces.  A final newline is just stripped */
 	if (res_len > 0 && res[res_len - 1] == '\n')
 	    res[res_len - 1] = '\0';
 	for (cp = res; *cp != '\0'; cp++)
 	    if (*cp == '\n')
 		*cp = ' ';
 	break;
+    }
     return res;
 bad:
     return bmake_strdup("");
+}
 /* Print a printf-style error message.
+ *
  * This error message has no consequences, in particular it does not affect
  * the exit status. */
 void
 Error(const char *fmt, ...)
+{
 	va_list ap;
 	FILE *err_file;
 	err_file = opts.debug_file;
 	if (err_file == stdout)
 		err_file = stderr;
 	(void)fflush(stdout);
 	for (;;) {
 		va_start(ap, fmt);
 		fprintf(err_file, "%s: ", progname);
 		(void)vfprintf(err_file, fmt, ap);
 		va_end(ap);
 		(void)fprintf(err_file, "\n");
 		(void)fflush(err_file);
 		if (err_file == stderr)
 			break;
 		err_file = stderr;
+	}
+}
 /* Produce a Fatal error message, then exit immediately.
+ *
- * If jobs are running, waits for them to finish. */
+ * If jobs are running, wait for them to finish. */
 void
 Fatal(const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	if (jobsRunning)
 		Job_Wait();
 	(void)fflush(stdout);
 	(void)vfprintf(stderr, fmt, ap);
 	va_end(ap);
 	(void)fprintf(stderr, "\n");
 	(void)fflush(stderr);
 	PrintOnError(NULL, NULL);
 	if (DEBUG(GRAPH2) || DEBUG(GRAPH3))
 		Targ_PrintGraph(2);
 	Trace_Log(MAKEERROR, 0);
 	exit(2);		/* Not 1 so -q can distinguish error */
+}
 /* Major exception once jobs are being created.
  * Kills all jobs, prints a message and exits. */
 void
 Punt(const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	(void)fflush(stdout);
 	(void)fprintf(stderr, "%s: ", progname);
 	(void)vfprintf(stderr, fmt, ap);
 	va_end(ap);
 	(void)fprintf(stderr, "\n");
 	(void)fflush(stderr);
 	PrintOnError(NULL, NULL);
 	DieHorribly();
+}
 /* Exit without giving a message. */
 void
 DieHorribly(void)
+{
 	if (jobsRunning)
 		Job_AbortAll();
 	if (DEBUG(GRAPH2))
 		Targ_PrintGraph(2);
 	Trace_Log(MAKEERROR, 0);
 	exit(2);		/* Not 1, so -q can distinguish error */
+}
 /* Called when aborting due to errors in child shell to signal abnormal exit.
  * The program exits.
  * Errors is the number of errors encountered in Make_Make. */
 void
 Finish(int errors)
+{
 	if (dieQuietly(NULL, -1))
 		exit(2);
 	Fatal("%d error%s", errors, errors == 1 ? "" : "s");
+}
 /*
  * eunlink --
  *	Remove a file carefully, avoiding directories.
  */
 int
 eunlink(const char *file)
+{
 	struct stat st;
 	if (lstat(file, &st) == -1)
 		return -1;
 	if (S_ISDIR(st.st_mode)) {
 		errno = EISDIR;
 		return -1;
+	}
 	return unlink(file);
+}
 static void
 write_all(int fd, const void *data, size_t n)
+{
 	const char *mem = data;
 	while (n > 0) {
 		ssize_t written = write(fd, mem, n);
 		if (written == -1 && errno == EAGAIN)
 			continue;
 		if (written == -1)
 			break;
 		mem += written;
 		n -= (size_t)written;
+	}
+}
 /*
  * execDie --
  *	Print why exec failed, avoiding stdio.
  */
 void MAKE_ATTR_DEAD
 execDie(const char *af, const char *av)
+{
 	Buffer buf;
 	Buf_Init(&buf, 0);
 	Buf_AddStr(&buf, progname);
 	Buf_AddStr(&buf, ": ");
 	Buf_AddStr(&buf, af);
 	Buf_AddStr(&buf, "(");
 	Buf_AddStr(&buf, av);
 	Buf_AddStr(&buf, ") failed (");
 	Buf_AddStr(&buf, strerror(errno));
 	Buf_AddStr(&buf, ")\n");
 	write_all(STDERR_FILENO, Buf_GetAll(&buf, NULL), Buf_Len(&buf));
 	Buf_Destroy(&buf, TRUE);
 	_exit(1);
+}
 /*
  * usage --
  *	exit with usage message
  */
 static void
 usage(void)
+{
 	char *p;
 	if ((p = strchr(progname, '[')) != NULL)
 		*p = '\0';
 	(void)fprintf(stderr,
 "usage: %s [-BeikNnqrstWwX] \n"
 "            [-C directory] [-D variable] [-d flags] [-f makefile]\n"
 "            [-I directory] [-J private] [-j max_jobs] [-m directory] [-T file]\n"
 "            [-V variable] [-v variable] [variable=value] [target ...]\n",
 	    progname);
 	exit(2);
+}
 /*
  * realpath(3) can get expensive, cache results...
  */
 static GNode *cached_realpaths = NULL;
 static GNode *
 get_cached_realpaths(void)
+{
     if (!cached_realpaths) {
 	cached_realpaths = Targ_NewGN("Realpath");
 #ifndef DEBUG_REALPATH_CACHE
 	cached_realpaths->flags = INTERNAL;
 #endif
+    }
     return cached_realpaths;
+}
 /* purge any relative paths */
 static void
 purge_cached_realpaths(void)
+{
     GNode *cache = get_cached_realpaths();
     HashEntry *he, *nhe;
     HashIter hi;
     HashIter_Init(&hi, &cache->context);
     he = HashIter_Next(&hi);
     while (he != NULL) {
 	nhe = HashIter_Next(&hi);
 	if (he->key[0] != '/') {
 	    if (DEBUG(DIR))
 		fprintf(stderr, "cached_realpath: purging %s\n", he->key);
 	    HashTable_DeleteEntry(&cache->context, he);
+	}
 	he = nhe;
+    }
+}
 char *
 cached_realpath(const char *pathname, char *resolved)
+{
     GNode *cache;
     const char *rp;
     void *freeIt;
     if (!pathname || !pathname[0])
 	return NULL;
     cache = get_cached_realpaths();
     if ((rp = Var_Value(pathname, cache, &freeIt)) != NULL) {
 	/* a hit */
 	strncpy(resolved, rp, MAXPATHLEN);
 	resolved[MAXPATHLEN - 1] = '\0';
     } else if ((rp = realpath(pathname, resolved)) != NULL) {
 	Var_Set(pathname, rp, cache);
     } /* else should we negative-cache? */
     bmake_free(freeIt);
     return rp ? resolved : NULL;
+}
 /*
  * Return true if we should die without noise.
  * For example our failing child was a sub-make
  * or failure happend elsewhere.
  */
 int
 dieQuietly(GNode *gn, int bf)
+{
     static int quietly = -1;
     if (quietly < 0) {
 	if (DEBUG(JOB) || !getBoolean(".MAKE.DIE_QUIETLY", TRUE))
 	    quietly = 0;
 	else if (bf >= 0)
 	    quietly = bf;
 	else
 	    quietly = gn != NULL ? ((gn->type  & (OP_MAKE)) != 0) : 0;
+    }
     return quietly;
+}
 static void
 SetErrorVars(GNode *gn)
+{
     StringListNode *ln;
     /*
      * We can print this even if there is no .ERROR target.
      */
     Var_Set(".ERROR_TARGET", gn->name, VAR_GLOBAL);
     Var_Delete(".ERROR_CMD", VAR_GLOBAL);
     for (ln = gn->commands->first; ln != NULL; ln = ln->next) {
 	const char *cmd = ln->datum;
 	if (cmd == NULL)
 	    break;
 	Var_Append(".ERROR_CMD", cmd, VAR_GLOBAL);
+    }
+}
 void
 PrintOnError(GNode *gn, const char *s)
+{
     static GNode *en = NULL;
     const char *expr;
     char *cp;
     if (DEBUG(HASH)) {
 	Targ_Stats();
 	Var_Stats();
+    }
     /* we generally want to keep quiet if a sub-make died */
     if (dieQuietly(gn, -1))
 	return;
     if (s)
 	printf("%s", s);
     printf("\n%s: stopped in %s\n", progname, curdir);
     if (en)
 	return;				/* we've been here! */
     if (gn)
 	SetErrorVars(gn);
     expr = "${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'\n@}";
     (void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &cp);
     /* TODO: handle errors */
     printf("%s", cp);
     free(cp);
     fflush(stdout);
     /*
      * Finally, see if there is a .ERROR target, and run it if so.
      */
     en = Targ_FindNode(".ERROR");
     if (en) {
 	en->type |= OP_SPECIAL;
 	Compat_Make(en, en);
+    }
+}
 void
 Main_ExportMAKEFLAGS(Boolean first)
+{
     static Boolean once = TRUE;
     const char *expr;
     char *s;
     if (once != first)
 	return;
     once = FALSE;
     expr = "${.MAKEFLAGS} ${.MAKEOVERRIDES:O:u:@v@$v=${$v:Q}@}";
     (void)Var_Subst(expr, VAR_CMDLINE, VARE_WANTRES, &s);
     /* TODO: handle errors */
     if (s[0] != '\0') {
 #ifdef POSIX
 	setenv("MAKEFLAGS", s, 1);
 #else
 	setenv("MAKE", s, 1);
 #endif
+    }
+}
 char *
 getTmpdir(void)
+{
     static char *tmpdir = NULL;
     if (!tmpdir) {
 	struct stat st;
 	/*
 	 * Honor $TMPDIR but only if it is valid.
 	 * Ensure it ends with /.
 	 */
 	(void)Var_Subst("${TMPDIR:tA:U" _PATH_TMP "}/", VAR_GLOBAL,
 			VARE_WANTRES, &tmpdir);
 	/* TODO: handle errors */
 	if (stat(tmpdir, &st) < 0 || !S_ISDIR(st.st_mode)) {
 	    free(tmpdir);
 	    tmpdir = bmake_strdup(_PATH_TMP);
+	}
+    }
     return tmpdir;
+}
 /*
  * Create and open a temp file using "pattern".
  * If out_fname is provided, set it to a copy of the filename created.
  * Otherwise unlink the file once open.
  */
 int
 mkTempFile(const char *pattern, char **out_fname)
+{
     static char *tmpdir = NULL;
     char tfile[MAXPATHLEN];
     int fd;
     if (pattern != NULL)
 	pattern = TMPPAT;
     if (tmpdir == NULL)
 	tmpdir = getTmpdir();
     if (pattern[0] == '/') {
 	snprintf(tfile, sizeof(tfile), "%s", pattern);
     } else {
 	snprintf(tfile, sizeof(tfile), "%s%s", tmpdir, pattern);
+    }
     if ((fd = mkstemp(tfile)) < 0)
 	Punt("Could not create temporary file %s: %s", tfile, strerror(errno));
     if (out_fname) {
 	*out_fname = bmake_strdup(tfile);
     } else {
 	unlink(tfile);			/* we just want the descriptor */
+    }
     return fd;
+}
 /*
  * Convert a string representation of a boolean.
  * Anything that looks like "No", "False", "Off", "0" etc,
  * is FALSE, otherwise TRUE.
  */
 Boolean
 s2Boolean(const char *s, Boolean bf)
+{
     switch(s[0]) {
     case '\0':			/* not set - the default wins */
 	break;
     case '0':
     case 'F':
     case 'f':
     case 'N':
     case 'n':
 	return FALSE;
     case 'O':
     case 'o':
 	return s[1] != 'F' && s[1] != 'f';
     default:
 	return TRUE;
+    }
     return bf;
+}
 /*
  * Return a Boolean based on a variable.
+ *
  * If the knob is not set, return the fallback.
  * If set, anything that looks or smells like "No", "False", "Off", "0", etc.
  * is FALSE, otherwise TRUE.
  */
 Boolean
 getBoolean(const char *varname, Boolean fallback)
+{
     char *expr = str_concat3("${", varname, ":U}");
     char *value;
     Boolean res;
     (void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &value);
     /* TODO: handle errors */
     res = s2Boolean(value, fallback);
     free(value);
     free(expr);
     return res;
+}

 @@ -1,1131 +1,1131 @@
-/*	$NetBSD: var.c,v 1.614 2020/10/31 09:57:47 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.615 2020/10/31 11:34:30 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Copyright (c) 1989 by Berkeley Softworks
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Handling of variables and the expressions formed from them.
+ *
  * Variables are set using lines of the form VAR=value.  Both the variable
  * name and the value can contain references to other variables, by using
  * expressions like ${VAR}, ${VAR:Modifiers}, ${${VARNAME}} or ${VAR:${MODS}}.
+ *
  * Interface:
  *	Var_Init	Initialize this module.
+ *
  *	Var_End		Clean up the module.
+ *
  *	Var_Set		Set the value of the variable, creating it if
  *			necessary.
+ *
  *	Var_Append	Append more characters to the variable, creating it if
  *			necessary. A space is placed between the old value and
  *			the new one.
+ *
  *	Var_Exists	See if a variable exists.
+ *
  *	Var_Value	Return the unexpanded value of a variable, or NULL if
  *			the variable is undefined.
+ *
  *	Var_Subst	Substitute all variable expressions in a string.
+ *
  *	Var_Parse	Parse a variable expression such as ${VAR:Mpattern}.
+ *
  *	Var_Delete	Delete a variable.
+ *
  *	Var_ExportVars	Export some or even all variables to the environment
  *			of this process and its child processes.
+ *
  *	Var_Export	Export the variable to the environment of this process
  *			and its child processes.
+ *
  *	Var_UnExport	Don't export the variable anymore.
+ *
  * Debugging:
  *	Var_Stats	Print out hashing statistics if in -dh mode.
+ *
  *	Var_Dump	Print out all variables defined in the given context.
+ *
  * XXX: There's a lot of duplication in these functions.
  */
 #include    <sys/stat.h>
 #ifndef NO_REGEX
 #include    <sys/types.h>
 #include    <regex.h>
 #endif
 #include    <inttypes.h>
 #include    <limits.h>
 #include    <time.h>
 #include    "make.h"
 #include    "dir.h"
 #include    "job.h"
 #include    "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.614 2020/10/31 09:57:47 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.615 2020/10/31 11:34:30 rillig Exp $");
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
 #define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3)
 #define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
 char **savedEnv = NULL;
 /* Special return value for Var_Parse, indicating a parse error.  It may be
  * caused by an undefined variable, a syntax error in a modifier or
  * something entirely different. */
 char var_Error[] = "";
 /* Special return value for Var_Parse, indicating an undefined variable in
  * a case where VARE_UNDEFERR is not set.  This undefined variable is
  * typically a dynamic variable such as ${.TARGET}, whose expansion needs to
  * be deferred until it is defined in an actual target. */
 static char varUndefined[] = "";
 /* Special return value for Var_Parse, just to avoid allocating empty strings.
  * In contrast to var_Error and varUndefined, this is not an error marker but
  * just an ordinary successful return value. */
 static char emptyString[] = "";
 /*
  * Traditionally this make consumed $$ during := like any other expansion.
  * Other make's do not, and this make follows straight since 2016-01-09.
+ *
  * This knob allows controlling the behavior.
  * FALSE to consume $$ during := assignment.
  * TRUE to preserve $$ during := assignment.
  */
 #define MAKE_SAVE_DOLLARS ".MAKE.SAVE_DOLLARS"
 static Boolean save_dollars = TRUE;
 /*
  * Internally, variables are contained in four different contexts.
  *	1) the environment. They cannot be changed. If an environment
  *	   variable is appended to, the result is placed in the global
  *	   context.
  *	2) the global context. Variables set in the makefiles are located
  *	   here.
  *	3) the command-line context. All variables set on the command line
  *	   are placed in this context.
  *	4) the local context. Each target has associated with it a context
  *	   list. On this list are located the structures describing such
  *	   local variables as $(@) and $(*)
  * The four contexts are searched in the reverse order from which they are
  * listed (but see opts.checkEnvFirst).
  */
 GNode          *VAR_INTERNAL;	/* variables from make itself */
 GNode          *VAR_GLOBAL;	/* variables from the makefile */
 GNode          *VAR_CMDLINE;	/* variables defined on the command-line */
 typedef enum VarFlags {
     /* The variable's value is currently being used by Var_Parse or Var_Subst.
      * This marker is used to avoid endless recursion. */
     VAR_IN_USE = 0x01,
     /* The variable comes from the environment.
      * These variables are not registered in any GNode, therefore they must
      * be freed as soon as they are not used anymore. */
     VAR_FROM_ENV = 0x02,
     /* The variable is exported to the environment, to be used by child
      * processes. */
     VAR_EXPORTED = 0x10,
     /* At the point where this variable was exported, it contained an
      * unresolved reference to another variable.  Before any child process is
      * started, it needs to be exported again, in the hope that the referenced
      * variable can then be resolved. */
     VAR_REEXPORT = 0x20,
     /* The variable came from the command line. */
     VAR_FROM_CMD = 0x40,
     /* The variable value cannot be changed anymore, and the variable cannot
      * be deleted.  Any attempts to do so are ignored. */
     VAR_READONLY = 0x80
 } VarFlags;
 ENUM_FLAGS_RTTI_6(VarFlags,
 		  VAR_IN_USE, VAR_FROM_ENV,
 		  VAR_EXPORTED, VAR_REEXPORT, VAR_FROM_CMD, VAR_READONLY);
 /* Variables are defined using one of the VAR=value assignments.  Their
  * value can be queried by expressions such as $V, ${VAR}, or with modifiers
  * such as ${VAR:S,from,to,g:Q}.
+ *
  * There are 3 kinds of variables: context variables, environment variables,
  * undefined variables.
+ *
  * Context variables are stored in a GNode.context.  The only way to undefine
  * a context variable is using the .undef directive.  In particular, it must
  * not be possible to undefine a variable during the evaluation of an
  * expression, or Var.name might point nowhere.
+ *
  * Environment variables are temporary.  They are returned by VarFind, and
  * after using them, they must be freed using VarFreeEnv.
+ *
  * Undefined variables occur during evaluation of variable expressions such
  * as ${UNDEF:Ufallback} in Var_Parse and ApplyModifiers.
  */
 typedef struct Var {
     /* The name of the variable, once set, doesn't change anymore.
      * For context variables, it aliases the corresponding HashEntry name.
      * For environment and undefined variables, it is allocated. */
     const char *name;
     void *name_freeIt;
     Buffer	  val;		/* its value */
     VarFlags	  flags;	/* miscellaneous status flags */
 } Var;
 /*
  * Exporting vars is expensive so skip it if we can
  */
 typedef enum VarExportedMode {
     VAR_EXPORTED_NONE,
     VAR_EXPORTED_SOME,
     VAR_EXPORTED_ALL
 } VarExportedMode;
 static VarExportedMode var_exportedVars = VAR_EXPORTED_NONE;
 typedef enum VarExportFlags {
     /*
      * We pass this to Var_Export when doing the initial export
      * or after updating an exported var.
      */
     VAR_EXPORT_PARENT	= 0x01,
     /*
      * We pass this to Var_Export1 to tell it to leave the value alone.
      */
     VAR_EXPORT_LITERAL	= 0x02
 } VarExportFlags;
 /* Flags for pattern matching in the :S and :C modifiers */
 typedef enum VarPatternFlags {
     VARP_SUB_GLOBAL	= 0x01,	/* Replace as often as possible ('g') */
     VARP_SUB_ONE	= 0x02,	/* Replace only once ('1') */
     VARP_ANCHOR_START	= 0x04,	/* Match at start of word ('^') */
     VARP_ANCHOR_END	= 0x08	/* Match at end of word ('$') */
 } VarPatternFlags;
 static Var *
 VarNew(const char *name, void *name_freeIt, const char *value, VarFlags flags)
+{
     size_t value_len = strlen(value);
     Var *var = bmake_malloc(sizeof *var);
     var->name = name;
     var->name_freeIt = name_freeIt;
     Buf_Init(&var->val, value_len + 1);
     Buf_AddBytes(&var->val, value, value_len);
     var->flags = flags;
     return var;
+}
 static const char *
 CanonicalVarname(const char *name)
+{
     if (*name == '.' && ch_isupper(name[1])) {
 	switch (name[1]) {
 	case 'A':
 	    if (strcmp(name, ".ALLSRC") == 0)
 		name = ALLSRC;
 	    if (strcmp(name, ".ARCHIVE") == 0)
 		name = ARCHIVE;
 	    break;
 	case 'I':
 	    if (strcmp(name, ".IMPSRC") == 0)
 		name = IMPSRC;
 	    break;
 	case 'M':
 	    if (strcmp(name, ".MEMBER") == 0)
 		name = MEMBER;
 	    break;
 	case 'O':
 	    if (strcmp(name, ".OODATE") == 0)
 		name = OODATE;
 	    break;
 	case 'P':
 	    if (strcmp(name, ".PREFIX") == 0)
 		name = PREFIX;
 	    break;
 	case 'S':
 	    if (strcmp(name, ".SHELL") == 0) {
 		if (!shellPath)
 		    Shell_Init();
+	    }
 	    break;
 	case 'T':
 	    if (strcmp(name, ".TARGET") == 0)
 		name = TARGET;
 	    break;
+	}
+    }
     /* GNU make has an additional alias $^ == ${.ALLSRC}. */
     return name;
+}
 static Var *
 GNode_FindVar(GNode *ctxt, const char *varname, unsigned int hash)
+{
     return HashTable_FindValueHash(&ctxt->context, varname, hash);
+}
 /* Find the variable in the context, and maybe in other contexts as well.
+ *
  * Input:
  *	name		name to find, is not expanded any further
  *	ctxt		context in which to look first
  *	elsewhere	TRUE to look in other contexts as well
+ *
  * Results:
  *	The found variable, or NULL if the variable does not exist.
  *	If the variable is an environment variable, it must be freed using
  *	VarFreeEnv after use.
  */
 static Var *
 VarFind(const char *name, GNode *ctxt, Boolean elsewhere)
+{
     Var *var;
     unsigned int nameHash;
     /*
      * If the variable name begins with a '.', it could very well be one of
      * the local ones.  We check the name against all the local variables
      * and substitute the short version in for 'name' if it matches one of
      * them.
      */
     name = CanonicalVarname(name);
     nameHash = Hash_Hash(name);
     /* First look for the variable in the given context. */
     var = GNode_FindVar(ctxt, name, nameHash);
     if (!elsewhere)
 	return var;
     /* The variable was not found in the given context.  Now look for it in
      * the other contexts as well. */
     if (var == NULL && ctxt != VAR_CMDLINE)
 	var = GNode_FindVar(VAR_CMDLINE, name, nameHash);
     if (!opts.checkEnvFirst && var == NULL && ctxt != VAR_GLOBAL) {
 	var = GNode_FindVar(VAR_GLOBAL, name, nameHash);
 	if (var == NULL && ctxt != VAR_INTERNAL) {
 	    /* VAR_INTERNAL is subordinate to VAR_GLOBAL */
 	    var = GNode_FindVar(VAR_INTERNAL, name, nameHash);
+	}
+    }
     if (var == NULL) {
 	char *env;
 	if ((env = getenv(name)) != NULL) {
 	    char *varname = bmake_strdup(name);
 	    return VarNew(varname, varname, env, VAR_FROM_ENV);
+	}
 	if (opts.checkEnvFirst && ctxt != VAR_GLOBAL) {
 	    var = GNode_FindVar(VAR_GLOBAL, name, nameHash);
 	    if (var == NULL && ctxt != VAR_INTERNAL)
 		var = GNode_FindVar(VAR_INTERNAL, name, nameHash);
 	    return var;
+	}
 	return NULL;
+    }
     return var;
+}
 /* If the variable is an environment variable, free it.
+ *
  * Input:
  *	v		the variable
  *	freeValue	true if the variable value should be freed as well
+ *
  * Results:
  *	TRUE if it is an environment variable, FALSE otherwise.
  */
 static Boolean
 VarFreeEnv(Var *v, Boolean freeValue)
+{
     if (!(v->flags & VAR_FROM_ENV))
 	return FALSE;
     free(v->name_freeIt);
     Buf_Destroy(&v->val, freeValue);
     free(v);
     return TRUE;
+}
 /* Add a new variable of the given name and value to the given context.
  * The name and val arguments are duplicated so they may safely be freed. */
 static void
 VarAdd(const char *name, const char *val, GNode *ctxt, VarSet_Flags flags)
+{
     HashEntry *he = HashTable_CreateEntry(&ctxt->context, name, NULL);
     Var *v = VarNew(he->key /* aliased */, NULL, val,
 		    flags & VAR_SET_READONLY ? VAR_READONLY : 0);
     HashEntry_Set(he, v);
     if (!(ctxt->flags & INTERNAL)) {
 	VAR_DEBUG3("%s:%s = %s\n", ctxt->name, name, val);
+    }
+}
 /* Remove a variable from a context, freeing all related memory as well.
  * The variable name is expanded once. */
 void
 Var_Delete(const char *name, GNode *ctxt)
+{
     char *name_freeIt = NULL;
     HashEntry *he;
     if (strchr(name, '$') != NULL) {
 	(void)Var_Subst(name, VAR_GLOBAL, VARE_WANTRES, &name_freeIt);
 	/* TODO: handle errors */
 	name = name_freeIt;
+    }
     he = HashTable_FindEntry(&ctxt->context, name);
     VAR_DEBUG3("%s:delete %s%s\n",
 	       ctxt->name, name, he != NULL ? "" : " (not found)");
     free(name_freeIt);
     if (he != NULL) {
 	Var *v = HashEntry_Get(he);
 	if (v->flags & VAR_EXPORTED)
 	    unsetenv(v->name);
 	if (strcmp(v->name, MAKE_EXPORTED) == 0)
 	    var_exportedVars = VAR_EXPORTED_NONE;
 	assert(v->name_freeIt == NULL);
 	HashTable_DeleteEntry(&ctxt->context, he);
 	Buf_Destroy(&v->val, TRUE);
 	free(v);
+    }
+}
 static Boolean
 MayExport(const char *name)
+{
     if (name[0] == '.')
 	return FALSE;		/* skip internals */
     if (name[0] == '-')
 	return FALSE;		/* skip misnamed variables */
     if (name[1] == '\0') {
 	/*
 	 * A single char.
 	 * If it is one of the vars that should only appear in
 	 * local context, skip it, else we can get Var_Subst
 	 * into a loop.
 	 */
 	switch (name[0]) {
 	case '@':
 	case '%':
 	case '*':
 	case '!':
 	    return FALSE;
+	}
+    }
     return TRUE;
+}
 /*
  * Export a single variable.
  * We ignore make internal variables (those which start with '.').
  * Also we jump through some hoops to avoid calling setenv
  * more than necessary since it can leak.
  * We only manipulate flags of vars if 'parent' is set.
  */
 static Boolean
 Var_Export1(const char *name, VarExportFlags flags)
+{
     VarExportFlags parent = flags & VAR_EXPORT_PARENT;
     Var *v;
     char *val;
     if (!MayExport(name))
 	return FALSE;
     v = VarFind(name, VAR_GLOBAL, 0);
     if (v == NULL)
 	return FALSE;
     if (!parent && (v->flags & VAR_EXPORTED) && !(v->flags & VAR_REEXPORT))
 	return FALSE;		/* nothing to do */
     val = Buf_GetAll(&v->val, NULL);
     if (!(flags & VAR_EXPORT_LITERAL) && strchr(val, '$') != NULL) {
 	char *expr;
 	if (parent) {
 	    /*
 	     * Flag the variable as something we need to re-export.
 	     * No point actually exporting it now though,
 	     * the child process can do it at the last minute.
 	     */
 	    v->flags |= VAR_EXPORTED | VAR_REEXPORT;
 	    return TRUE;
+	}
 	if (v->flags & VAR_IN_USE) {
 	    /*
 	     * We recursed while exporting in a child.
 	     * This isn't going to end well, just skip it.
 	     */
 	    return FALSE;
+	}
 	/* XXX: name is injected without escaping it */
 	expr = str_concat3("${", name, "}");
 	(void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &val);
 	/* TODO: handle errors */
 	setenv(name, val, 1);
 	free(val);
 	free(expr);
     } else {
 	if (parent)
 	    v->flags &= ~(unsigned)VAR_REEXPORT;	/* once will do */
 	if (parent || !(v->flags & VAR_EXPORTED))
 	    setenv(name, val, 1);
+    }
     /*
      * This is so Var_Set knows to call Var_Export again...
      */
     if (parent) {
 	v->flags |= VAR_EXPORTED;
+    }
     return TRUE;
+}
 /*
  * This gets called from our child processes.
  */
 void
 Var_ExportVars(void)
+{
     char *val;
     /*
      * Several make's support this sort of mechanism for tracking
      * recursion - but each uses a different name.
      * We allow the makefiles to update MAKELEVEL and ensure
      * children see a correctly incremented value.
      */
     char tmp[BUFSIZ];
     snprintf(tmp, sizeof(tmp), "%d", makelevel + 1);
     setenv(MAKE_LEVEL_ENV, tmp, 1);
     if (var_exportedVars == VAR_EXPORTED_NONE)
 	return;
     if (var_exportedVars == VAR_EXPORTED_ALL) {
 	HashIter hi;
 	/* Ouch! Exporting all variables at once is crazy... */
 	HashIter_Init(&hi, &VAR_GLOBAL->context);
 	while (HashIter_Next(&hi) != NULL) {
 	    Var *var = hi.entry->value;
 	    Var_Export1(var->name, 0);
+	}
 	return;
+    }
     (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, VARE_WANTRES, &val);
     /* TODO: handle errors */
     if (*val) {
 	Words words = Str_Words(val, FALSE);
 	size_t i;
 	for (i = 0; i < words.len; i++)
 	    Var_Export1(words.words[i], 0);
 	Words_Free(words);
+    }
     free(val);
+}
 /*
  * This is called when .export is seen or .MAKE.EXPORTED is modified.
+ *
  * It is also called when any exported variable is modified.
  * XXX: Is it really?
+ *
  * str has the format "[-env|-literal] varname...".
  */
 void
 Var_Export(const char *str, Boolean isExport)
+{
     VarExportFlags flags;
     char *val;
     if (isExport && str[0] == '\0') {
 	var_exportedVars = VAR_EXPORTED_ALL; /* use with caution! */
 	return;
+    }
     if (isExport && strncmp(str, "-env", 4) == 0) {
 	str += 4;
 	flags = 0;
     } else if (isExport && strncmp(str, "-literal", 8) == 0) {
 	str += 8;
 	flags = VAR_EXPORT_LITERAL;
     } else {
 	flags = VAR_EXPORT_PARENT;
+    }
     (void)Var_Subst(str, VAR_GLOBAL, VARE_WANTRES, &val);
     /* TODO: handle errors */
     if (val[0] != '\0') {
 	Words words = Str_Words(val, FALSE);
 	size_t i;
 	for (i = 0; i < words.len; i++) {
 	    const char *name = words.words[i];
 	    if (Var_Export1(name, flags)) {
 		if (var_exportedVars == VAR_EXPORTED_NONE)
 		    var_exportedVars = VAR_EXPORTED_SOME;
 		if (isExport && (flags & VAR_EXPORT_PARENT)) {
 		    Var_Append(MAKE_EXPORTED, name, VAR_GLOBAL);
+		}
+	    }
+	}
 	Words_Free(words);
+    }
     free(val);
+}
 extern char **environ;
 /*
  * This is called when .unexport[-env] is seen.
+ *
  * str must have the form "unexport[-env] varname...".
  */
 void
 Var_UnExport(const char *str)
+{
     const char *varnames;
     char *varnames_freeIt;
     Boolean unexport_env;
     varnames = NULL;
     varnames_freeIt = NULL;
     str += strlen("unexport");
     unexport_env = strncmp(str, "-env", 4) == 0;
     if (unexport_env) {
 	const char *cp;
 	char **newenv;
 	cp = getenv(MAKE_LEVEL_ENV);	/* we should preserve this */
 	if (environ == savedEnv) {
 	    /* we have been here before! */
 	    newenv = bmake_realloc(environ, 2 * sizeof(char *));
 	} else {
 	    if (savedEnv) {
 		free(savedEnv);
 		savedEnv = NULL;
+	    }
 	    newenv = bmake_malloc(2 * sizeof(char *));
+	}
 	/* Note: we cannot safely free() the original environ. */
 	environ = savedEnv = newenv;
 	newenv[0] = NULL;
 	newenv[1] = NULL;
 	if (cp && *cp)
 	    setenv(MAKE_LEVEL_ENV, cp, 1);
     } else {
 	cpp_skip_whitespace(&str);
 	if (str[0] != '\0')
 	    varnames = str;
+    }
     if (varnames == NULL) {
 	/* Using .MAKE.EXPORTED */
 	(void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, VARE_WANTRES,
 			&varnames_freeIt);
 	/* TODO: handle errors */
 	varnames = varnames_freeIt;
+    }
+    {
 	Var *v;
 	size_t i;
 	Words words = Str_Words(varnames, FALSE);
 	for (i = 0; i < words.len; i++) {
 	    const char *varname = words.words[i];
 	    v = VarFind(varname, VAR_GLOBAL, 0);
 	    if (v == NULL) {
 		VAR_DEBUG1("Not unexporting \"%s\" (not found)\n", varname);
 		continue;
+	    }
 	    VAR_DEBUG1("Unexporting \"%s\"\n", varname);
 	    if (!unexport_env && (v->flags & VAR_EXPORTED) &&
 		!(v->flags & VAR_REEXPORT))
 		unsetenv(v->name);
 	    v->flags &= ~(unsigned)(VAR_EXPORTED | VAR_REEXPORT);
 	    /*
 	     * If we are unexporting a list,
 	     * remove each one from .MAKE.EXPORTED.
 	     * If we are removing them all,
 	     * just delete .MAKE.EXPORTED below.
 	     */
 	    if (varnames == str) {
 		/* XXX: v->name is injected without escaping it */
 		char *expr = str_concat3("${" MAKE_EXPORTED ":N", v->name, "}");
 		char *cp;
 		(void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &cp);
 		/* TODO: handle errors */
 		Var_Set(MAKE_EXPORTED, cp, VAR_GLOBAL);
 		free(cp);
 		free(expr);
+	    }
+	}
 	Words_Free(words);
 	if (varnames != str) {
 	    Var_Delete(MAKE_EXPORTED, VAR_GLOBAL);
 	    free(varnames_freeIt);
+	}
+    }
+}
 /* See Var_Set for documentation. */
 void
 Var_Set_with_flags(const char *name, const char *val, GNode *ctxt,
 		   VarSet_Flags flags)
+{
     const char *unexpanded_name = name;
     char *name_freeIt = NULL;
     Var *v;
     assert(val != NULL);
     if (strchr(name, '$') != NULL) {
 	(void)Var_Subst(name, ctxt, VARE_WANTRES, &name_freeIt);
 	/* TODO: handle errors */
 	name = name_freeIt;
+    }
     if (name[0] == '\0') {
 	VAR_DEBUG2("Var_Set(\"%s\", \"%s\", ...) "
 		   "name expands to empty string - ignored\n",
 		   unexpanded_name, val);
 	free(name_freeIt);
 	return;
+    }
     if (ctxt == VAR_GLOBAL) {
 	v = VarFind(name, VAR_CMDLINE, 0);
 	if (v != NULL) {
 	    if (v->flags & VAR_FROM_CMD) {
 		VAR_DEBUG3("%s:%s = %s ignored!\n", ctxt->name, name, val);
 		goto out;
+	    }
 	    VarFreeEnv(v, TRUE);
+	}
+    }
     /*
      * We only look for a variable in the given context since anything set
      * here will override anything in a lower context, so there's not much
      * point in searching them all just to save a bit of memory...
      */
     v = VarFind(name, ctxt, 0);
     if (v == NULL) {
 	if (ctxt == VAR_CMDLINE && !(flags & VAR_NO_EXPORT)) {
 	    /*
 	     * This var would normally prevent the same name being added
 	     * to VAR_GLOBAL, so delete it from there if needed.
 	     * Otherwise -V name may show the wrong value.
 	     */
 	    /* XXX: name is expanded for the second time */
 	    Var_Delete(name, VAR_GLOBAL);
+	}
 	VarAdd(name, val, ctxt, flags);
     } else {
 	if ((v->flags & VAR_READONLY) && !(flags & VAR_SET_READONLY)) {
 	    VAR_DEBUG3("%s:%s = %s ignored (read-only)\n",
 		       ctxt->name, name, val);
 	    goto out;
+	}
 	Buf_Empty(&v->val);
 	Buf_AddStr(&v->val, val);
 	VAR_DEBUG3("%s:%s = %s\n", ctxt->name, name, val);
 	if (v->flags & VAR_EXPORTED) {
 	    Var_Export1(name, VAR_EXPORT_PARENT);
+	}
+    }
     /*
      * Any variables given on the command line are automatically exported
      * to the environment (as per POSIX standard)
      * Other than internals.
      */
     if (ctxt == VAR_CMDLINE && !(flags & VAR_NO_EXPORT) && name[0] != '.') {
 	if (v == NULL)
 	    v = VarFind(name, ctxt, 0);	/* we just added it */
 	v->flags |= VAR_FROM_CMD;
 	/*
 	 * If requested, don't export these in the environment
 	 * individually.  We still put them in MAKEOVERRIDES so
 	 * that the command-line settings continue to override
 	 * Makefile settings.
 	 */
 	if (!opts.varNoExportEnv)
 	    setenv(name, val, 1);
 	Var_Append(MAKEOVERRIDES, name, VAR_GLOBAL);
+    }
     if (name[0] == '.' && strcmp(name, MAKE_SAVE_DOLLARS) == 0)
 	save_dollars = s2Boolean(val, save_dollars);
 out:
     free(name_freeIt);
     if (v != NULL)
 	VarFreeEnv(v, TRUE);
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Set --
  *	Set the variable name to the value val in the given context.
+ *
  *	If the variable doesn't yet exist, it is created.
  *	Otherwise the new value overwrites and replaces the old value.
+ *
  * Input:
  *	name		name of the variable to set, is expanded once
  *	val		value to give to the variable
  *	ctxt		context in which to set it
+ *
  * Notes:
  *	The variable is searched for only in its context before being
  *	created in that context. I.e. if the context is VAR_GLOBAL,
  *	only VAR_GLOBAL->context is searched. Likewise if it is VAR_CMDLINE,
  *	only VAR_CMDLINE->context is searched. This is done to avoid the
  *	literally thousands of unnecessary strcmp's that used to be done to
  *	set, say, $(@) or $(<).
  *	If the context is VAR_GLOBAL though, we check if the variable
  *	was set in VAR_CMDLINE from the command line and skip it if so.
  *-----------------------------------------------------------------------
  */
 void
 Var_Set(const char *name, const char *val, GNode *ctxt)
+{
     Var_Set_with_flags(name, val, ctxt, 0);
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Append --
  *	The variable of the given name has the given value appended to it in
  *	the given context.
+ *
  *	If the variable doesn't exist, it is created. Otherwise the strings
  *	are concatenated, with a space in between.
+ *
  * Input:
  *	name		name of the variable to modify, is expanded once
  *	val		string to append to it
  *	ctxt		context in which this should occur
+ *
  * Notes:
  *	Only if the variable is being sought in the global context is the
  *	environment searched.
  *	XXX: Knows its calling circumstances in that if called with ctxt
  *	an actual target, it will only search that context since only
  *	a local variable could be being appended to. This is actually
  *	a big win and must be tolerated.
  *-----------------------------------------------------------------------
  */
 void
 Var_Append(const char *name, const char *val, GNode *ctxt)
+{
     char *name_freeIt = NULL;
     Var *v;
     assert(val != NULL);
     if (strchr(name, '$') != NULL) {
 	const char *unexpanded_name = name;
 	(void)Var_Subst(name, ctxt, VARE_WANTRES, &name_freeIt);
 	/* TODO: handle errors */
 	name = name_freeIt;
 	if (name[0] == '\0') {
 	    VAR_DEBUG2("Var_Append(\"%s\", \"%s\", ...) "
 		       "name expands to empty string - ignored\n",
 		       unexpanded_name, val);
 	    free(name_freeIt);
 	    return;
+	}
+    }
     v = VarFind(name, ctxt, ctxt == VAR_GLOBAL);
     if (v == NULL) {
 	/* XXX: name is expanded for the second time */
 	Var_Set(name, val, ctxt);
     } else if (v->flags & VAR_READONLY) {
 	VAR_DEBUG1("Ignoring append to %s since it is read-only\n", name);
     } else if (ctxt == VAR_CMDLINE || !(v->flags & VAR_FROM_CMD)) {
 	Buf_AddByte(&v->val, ' ');
 	Buf_AddStr(&v->val, val);
 	VAR_DEBUG3("%s:%s = %s\n",
 		   ctxt->name, name, Buf_GetAll(&v->val, NULL));
 	if (v->flags & VAR_FROM_ENV) {
 	    HashEntry *h;
 	    /*
 	     * If the original variable came from the environment, we
 	     * have to install it in the global context (we could place
 	     * it in the environment, but then we should provide a way to
 	     * export other variables...)
 	     */
 	    v->flags &= ~(unsigned)VAR_FROM_ENV;
 	    h = HashTable_CreateEntry(&ctxt->context, name, NULL);
 	    HashEntry_Set(h, v);
+	}
+    }
     free(name_freeIt);
+}
 /* See if the given variable exists, in the given context or in other
  * fallback contexts.
+ *
  * Input:
  *	name		Variable to find, is expanded once
  *	ctxt		Context in which to start search
  */
 Boolean
 Var_Exists(const char *name, GNode *ctxt)
+{
     char *name_freeIt = NULL;
     Var *v;
     if (strchr(name, '$') != NULL) {
 	(void)Var_Subst(name, ctxt, VARE_WANTRES, &name_freeIt);
 	/* TODO: handle errors */
 	name = name_freeIt;
+    }
     v = VarFind(name, ctxt, TRUE);
     free(name_freeIt);
     if (v == NULL)
 	return FALSE;
     (void)VarFreeEnv(v, TRUE);
     return TRUE;
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Value --
  *	Return the unexpanded value of the given variable in the given
  *	context, or the usual contexts.
+ *
  * Input:
  *	name		name to find, is not expanded any further
  *	ctxt		context in which to search for it
+ *
  * Results:
  *	The value if the variable exists, NULL if it doesn't.
  *	If the returned value is not NULL, the caller must free *freeIt
  *	as soon as the returned value is no longer needed.
  *-----------------------------------------------------------------------
  */
 const char *
 Var_Value(const char *name, GNode *ctxt, void **freeIt)
+{
     Var *v = VarFind(name, ctxt, TRUE);
     char *value;
     *freeIt = NULL;
     if (v == NULL)
 	return NULL;
     value = Buf_GetAll(&v->val, NULL);
     if (VarFreeEnv(v, FALSE))
 	*freeIt = value;
     return value;
+}
 /* SepBuf is a string being built from words, interleaved with separators. */
 typedef struct SepBuf {
     Buffer buf;
     Boolean needSep;
     char sep;			/* usually ' ', but see the :ts modifier */
 } SepBuf;
 static void
 SepBuf_Init(SepBuf *buf, char sep)
+{
     Buf_Init(&buf->buf, 32 /* bytes */);
     buf->needSep = FALSE;
     buf->sep = sep;
+}
 static void
 SepBuf_Sep(SepBuf *buf)
+{
     buf->needSep = TRUE;
+}
 static void
 SepBuf_AddBytes(SepBuf *buf, const char *mem, size_t mem_size)
+{
     if (mem_size == 0)
 	return;
     if (buf->needSep && buf->sep != '\0') {
 	Buf_AddByte(&buf->buf, buf->sep);
 	buf->needSep = FALSE;
+    }
     Buf_AddBytes(&buf->buf, mem, mem_size);
+}
 static void
 SepBuf_AddBytesBetween(SepBuf *buf, const char *start, const char *end)
+{
     SepBuf_AddBytes(buf, start, (size_t)(end - start));
+}
 static void
 SepBuf_AddStr(SepBuf *buf, const char *str)
+{
     SepBuf_AddBytes(buf, str, strlen(str));
+}
 static char *
 SepBuf_Destroy(SepBuf *buf, Boolean free_buf)
+{
     return Buf_Destroy(&buf->buf, free_buf);
+}
 /* This callback for ModifyWords gets a single word from a variable expression
  * and typically adds a modification of this word to the buffer. It may also
  * do nothing or add several words.
+ *
  * For example, in ${:Ua b c:M*2}, the callback is called 3 times, once for
  * each word of "a b c". */
 typedef void (*ModifyWordsCallback)(const char *word, SepBuf *buf, void *data);
 /* Callback for ModifyWords to implement the :H modifier.
  * Add the dirname of the given word to the buffer. */
 static void
 ModifyWord_Head(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
+{
     const char *slash = strrchr(word, '/');
     if (slash != NULL)
 	SepBuf_AddBytesBetween(buf, word, slash);
     else
 	SepBuf_AddStr(buf, ".");
+}
 /* Callback for ModifyWords to implement the :T modifier.
  * Add the basename of the given word to the buffer. */
 static void
 ModifyWord_Tail(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
+{
     const char *slash = strrchr(word, '/');
     const char *base = slash != NULL ? slash + 1 : word;
     SepBuf_AddStr(buf, base);
+}
 /* Callback for ModifyWords to implement the :E modifier.
  * Add the filename suffix of the given word to the buffer, if it exists. */
 static void
 ModifyWord_Suffix(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
+{
     const char *dot = strrchr(word, '.');
     if (dot != NULL)
 	SepBuf_AddStr(buf, dot + 1);
+}
 /* Callback for ModifyWords to implement the :R modifier.
  * Add the basename of the given word to the buffer. */
 static void
 @@ -2666,1231 +2666,1227 @@ ApplyModifier_Words(const char **pp, App
+    }
     /*
      * We expect estr to contain a single integer for :[N], or two integers
      * separated by ".." for :[start..end].
      */
     first = (int)strtol(estr, &ep, 0);
     if (ep == estr)		/* Found junk instead of a number */
 	goto bad_modifier;
     if (ep[0] == '\0') {	/* Found only one integer in :[N] */
 	last = first;
     } else if (ep[0] == '.' && ep[1] == '.' && ep[2] != '\0') {
 	/* Expecting another integer after ".." */
 	ep += 2;
 	last = (int)strtol(ep, &ep, 0);
 	if (ep[0] != '\0')	/* Found junk after ".." */
 	    goto bad_modifier;
     } else
 	goto bad_modifier;	/* Found junk instead of ".." */
     /*
      * Now seldata is properly filled in, but we still have to check for 0 as
      * a special case.
      */
     if (first == 0 && last == 0) {
 	/* ":[0]" or perhaps ":[0..0]" */
 	st->oneBigWord = TRUE;
 	st->newVal = st->val;
 	goto ok;
+    }
     /* ":[0..N]" or ":[N..0]" */
     if (first == 0 || last == 0)
 	goto bad_modifier;
     /* Normal case: select the words described by seldata. */
     st->newVal = VarSelectWords(st->sep, st->oneBigWord, st->val, first, last);
 ok:
     free(estr);
     return AMR_OK;
 bad_modifier:
     free(estr);
     return AMR_BAD;
+}
 static int
 str_cmp_asc(const void *a, const void *b)
+{
     return strcmp(*(const char * const *)a, *(const char * const *)b);
+}
 static int
 str_cmp_desc(const void *a, const void *b)
+{
     return strcmp(*(const char * const *)b, *(const char * const *)a);
+}
 /* :O (order ascending) or :Or (order descending) or :Ox (shuffle) */
 static ApplyModifierResult
 ApplyModifier_Order(const char **pp, ApplyModifiersState *st)
+{
     const char *mod = (*pp)++;	/* skip past the 'O' in any case */
     Words words = Str_Words(st->val, FALSE);
     if (mod[1] == st->endc || mod[1] == ':') {
 	/* :O sorts ascending */
 	qsort(words.words, words.len, sizeof(char *), str_cmp_asc);
     } else if ((mod[1] == 'r' || mod[1] == 'x') &&
 	       (mod[2] == st->endc || mod[2] == ':')) {
 	(*pp)++;
 	if (mod[1] == 'r') {
 	    /* :Or sorts descending */
 	    qsort(words.words, words.len, sizeof(char *), str_cmp_desc);
 	} else {
 	    /* :Ox shuffles
+	     *
 	     * We will use [ac..2] range for mod factors. This will produce
 	     * random numbers in [(ac-1)..0] interval, and minimal
 	     * reasonable value for mod factor is 2 (the mod 1 will produce
 	     * 0 with probability 1).
 	     */
 	    size_t i;
 	    for (i = words.len - 1; i > 0; i--) {
 		size_t rndidx = (size_t)random() % (i + 1);
 		char *t = words.words[i];
 		words.words[i] = words.words[rndidx];
 		words.words[rndidx] = t;
+	    }
+	}
     } else {
 	Words_Free(words);
 	return AMR_BAD;
+    }
     st->newVal = Words_JoinFree(words);
     return AMR_OK;
+}
 /* :? then : else */
 static ApplyModifierResult
 ApplyModifier_IfElse(const char **pp, ApplyModifiersState *st)
+{
     char *then_expr, *else_expr;
     VarParseResult res;
     Boolean value = FALSE;
     VarEvalFlags then_eflags = st->eflags & ~(unsigned)VARE_WANTRES;
     VarEvalFlags else_eflags = st->eflags & ~(unsigned)VARE_WANTRES;
     int cond_rc = COND_PARSE;	/* anything other than COND_INVALID */
     if (st->eflags & VARE_WANTRES) {
 	cond_rc = Cond_EvalCondition(st->v->name, &value);
 	if (cond_rc != COND_INVALID && value)
 	    then_eflags |= VARE_WANTRES;
 	if (cond_rc != COND_INVALID && !value)
 	    else_eflags |= VARE_WANTRES;
+    }
     (*pp)++;			/* skip past the '?' */
     res = ParseModifierPart(pp, ':', then_eflags, st,
 			    &then_expr, NULL, NULL, NULL);
     if (res != VPR_OK)
 	return AMR_CLEANUP;
     res = ParseModifierPart(pp, st->endc, else_eflags, st,
 			    &else_expr, NULL, NULL, NULL);
     if (res != VPR_OK)
 	return AMR_CLEANUP;
     (*pp)--;
     if (cond_rc == COND_INVALID) {
 	Error("Bad conditional expression `%s' in %s?%s:%s",
 	      st->v->name, st->v->name, then_expr, else_expr);
 	return AMR_CLEANUP;
+    }
     if (value) {
 	st->newVal = then_expr;
 	free(else_expr);
     } else {
 	st->newVal = else_expr;
 	free(then_expr);
+    }
     ApplyModifiersState_Define(st);
     return AMR_OK;
+}
 /*
  * The ::= modifiers actually assign a value to the variable.
  * Their main purpose is in supporting modifiers of .for loop
  * iterators and other obscure uses.  They always expand to
  * nothing.  In a target rule that would otherwise expand to an
  * empty line they can be preceded with @: to keep make happy.
  * Eg.
+ *
  * foo:	.USE
  * .for i in ${.TARGET} ${.TARGET:R}.gz
  *	@: ${t::=$i}
  *	@echo blah ${t:T}
  * .endfor
+ *
  *	  ::=<str>	Assigns <str> as the new value of variable.
  *	  ::?=<str>	Assigns <str> as value of variable if
  *			it was not already set.
  *	  ::+=<str>	Appends <str> to variable.
  *	  ::!=<cmd>	Assigns output of <cmd> as the new value of
  *			variable.
  */
 static ApplyModifierResult
 ApplyModifier_Assign(const char **pp, ApplyModifiersState *st)
+{
     GNode *v_ctxt;
     char delim;
     char *val;
     VarParseResult res;
     const char *mod = *pp;
     const char *op = mod + 1;
     if (!(op[0] == '=' ||
 	  (op[1] == '=' &&
 	   (op[0] == '!' || op[0] == '+' || op[0] == '?'))))
 	return AMR_UNKNOWN;	/* "::<unrecognised>" */
     if (st->v->name[0] == '\0') {
 	*pp = mod + 1;
 	return AMR_BAD;
+    }
     v_ctxt = st->ctxt;		/* context where v belongs */
     if (!(st->exprFlags & VEF_UNDEF) && st->ctxt != VAR_GLOBAL) {
 	Var *gv = VarFind(st->v->name, st->ctxt, 0);
 	if (gv == NULL)
 	    v_ctxt = VAR_GLOBAL;
 	else
 	    VarFreeEnv(gv, TRUE);
+    }
     switch (op[0]) {
     case '+':
     case '?':
     case '!':
 	*pp = mod + 3;
 	break;
     default:
 	*pp = mod + 2;
 	break;
+    }
     delim = st->startc == '(' ? ')' : '}';
     res = ParseModifierPart(pp, delim, st->eflags, st, &val, NULL, NULL, NULL);
     if (res != VPR_OK)
 	return AMR_CLEANUP;
     (*pp)--;
     if (st->eflags & VARE_WANTRES) {
 	switch (op[0]) {
 	case '+':
 	    Var_Append(st->v->name, val, v_ctxt);
 	    break;
 	case '!': {
 	    const char *errfmt;
 	    char *cmd_output = Cmd_Exec(val, &errfmt);
 	    if (errfmt)
 		Error(errfmt, val);
 	    else
 		Var_Set(st->v->name, cmd_output, v_ctxt);
 	    free(cmd_output);
 	    break;
+	}
 	case '?':
 	    if (!(st->exprFlags & VEF_UNDEF))
 		break;
 	    /* FALLTHROUGH */
 	default:
 	    Var_Set(st->v->name, val, v_ctxt);
 	    break;
+	}
+    }
     free(val);
     st->newVal = emptyString;
     return AMR_OK;
+}
 /* remember current value */
 static ApplyModifierResult
 ApplyModifier_Remember(const char **pp, ApplyModifiersState *st)
+{
     const char *mod = *pp;
     if (!ModMatchEq(mod, "_", st->endc))
 	return AMR_UNKNOWN;
     if (mod[1] == '=') {
 	size_t n = strcspn(mod + 2, ":)}");
 	char *name = bmake_strldup(mod + 2, n);
 	Var_Set(name, st->val, st->ctxt);
 	free(name);
 	*pp = mod + 2 + n;
     } else {
 	Var_Set("_", st->val, st->ctxt);
 	*pp = mod + 1;
+    }
     st->newVal = st->val;
     return AMR_OK;
+}
 /* Apply the given function to each word of the variable value. */
 static ApplyModifierResult
 ApplyModifier_WordFunc(const char **pp, ApplyModifiersState *st,
 		       ModifyWordsCallback modifyWord)
+{
     char delim = (*pp)[1];
     if (delim != st->endc && delim != ':')
 	return AMR_UNKNOWN;
     st->newVal = ModifyWords(st->ctxt, st->sep, st->oneBigWord,
 			     st->val, modifyWord, NULL);
     (*pp)++;
     return AMR_OK;
+}
 static ApplyModifierResult
 ApplyModifier_Unique(const char **pp, ApplyModifiersState *st)
+{
     if ((*pp)[1] == st->endc || (*pp)[1] == ':') {
 	st->newVal = VarUniq(st->val);
 	(*pp)++;
 	return AMR_OK;
     } else
 	return AMR_UNKNOWN;
+}
 #ifdef SYSVVARSUB
 /* :from=to */
 static ApplyModifierResult
 ApplyModifier_SysV(const char **pp, ApplyModifiersState *st)
+{
     char *lhs, *rhs;
     VarParseResult res;
     const char *mod = *pp;
     Boolean eqFound = FALSE;
     /*
      * First we make a pass through the string trying
      * to verify it is a SYSV-make-style translation:
      * it must be: <string1>=<string2>)
      */
     int nest = 1;
     const char *next = mod;
     while (*next != '\0' && nest > 0) {
 	if (*next == '=') {
 	    eqFound = TRUE;
 	    /* continue looking for st->endc */
 	} else if (*next == st->endc)
 	    nest--;
 	else if (*next == st->startc)
 	    nest++;
 	if (nest > 0)
 	    next++;
+    }
     if (*next != st->endc || !eqFound)
 	return AMR_UNKNOWN;
     *pp = mod;
     res = ParseModifierPart(pp, '=', st->eflags, st,
 			    &lhs, NULL, NULL, NULL);
     if (res != VPR_OK)
 	return AMR_CLEANUP;
     res = ParseModifierPart(pp, st->endc, st->eflags, st,
 			    &rhs, NULL, NULL, NULL);
     if (res != VPR_OK)
 	return AMR_CLEANUP;
     /*
      * SYSV modifications happen through the whole
      * string. Note the pattern is anchored at the end.
      */
     (*pp)--;
     if (lhs[0] == '\0' && st->val[0] == '\0') {
 	st->newVal = st->val;	/* special case */
     } else {
 	struct ModifyWord_SYSVSubstArgs args = {st->ctxt, lhs, rhs};
 	st->newVal = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->val,
 				 ModifyWord_SYSVSubst, &args);
+    }
     free(lhs);
     free(rhs);
     return AMR_OK;
+}
 #endif
 #ifdef SUNSHCMD
 /* :sh */
 static ApplyModifierResult
 ApplyModifier_SunShell(const char **pp, ApplyModifiersState *st)
+{
     const char *p = *pp;
     if (p[1] == 'h' && (p[2] == st->endc || p[2] == ':')) {
 	if (st->eflags & VARE_WANTRES) {
 	    const char *errfmt;
 	    st->newVal = Cmd_Exec(st->val, &errfmt);
 	    if (errfmt)
 		Error(errfmt, st->val);
 	} else
 	    st->newVal = emptyString;
 	*pp = p + 2;
 	return AMR_OK;
     } else
 	return AMR_UNKNOWN;
+}
 #endif
 static void
 LogBeforeApply(const ApplyModifiersState *st, const char *mod, const char endc)
+{
     char eflags_str[VarEvalFlags_ToStringSize];
     char vflags_str[VarFlags_ToStringSize];
     char exprflags_str[VarExprFlags_ToStringSize];
     Boolean is_single_char = mod[0] != '\0' &&
 			     (mod[1] == endc || mod[1] == ':');
     /* At this point, only the first character of the modifier can
      * be used since the end of the modifier is not yet known. */
     debug_printf("Applying ${%s:%c%s} to \"%s\" (%s, %s, %s)\n",
 		 st->v->name, mod[0], is_single_char ? "" : "...", st->val,
 		 Enum_FlagsToString(eflags_str, sizeof eflags_str,
 				    st->eflags, VarEvalFlags_ToStringSpecs),
 		 Enum_FlagsToString(vflags_str, sizeof vflags_str,
 				    st->v->flags, VarFlags_ToStringSpecs),
 		 Enum_FlagsToString(exprflags_str, sizeof exprflags_str,
 				    st->exprFlags,
 				    VarExprFlags_ToStringSpecs));
+}
 static void
 LogAfterApply(ApplyModifiersState *st, const char *p, const char *mod)
+{
     char eflags_str[VarEvalFlags_ToStringSize];
     char vflags_str[VarFlags_ToStringSize];
     char exprflags_str[VarExprFlags_ToStringSize];
     const char *quot = st->newVal == var_Error ? "" : "\"";
     const char *newVal = st->newVal == var_Error ? "error" : st->newVal;
     debug_printf("Result of ${%s:%.*s} is %s%s%s (%s, %s, %s)\n",
 		 st->v->name, (int)(p - mod), mod, quot, newVal, quot,
 		 Enum_FlagsToString(eflags_str, sizeof eflags_str,
 				    st->eflags, VarEvalFlags_ToStringSpecs),
 		 Enum_FlagsToString(vflags_str, sizeof vflags_str,
 				    st->v->flags, VarFlags_ToStringSpecs),
 		 Enum_FlagsToString(exprflags_str, sizeof exprflags_str,
 				    st->exprFlags,
 				    VarExprFlags_ToStringSpecs));
+}
 static ApplyModifierResult
 ApplyModifier(const char **pp, ApplyModifiersState *st)
+{
     switch (**pp) {
     case ':':
 	return ApplyModifier_Assign(pp, st);
     case '@':
 	return ApplyModifier_Loop(pp, st);
     case '_':
 	return ApplyModifier_Remember(pp, st);
     case 'D':
     case 'U':
 	return ApplyModifier_Defined(pp, st);
     case 'L':
 	return ApplyModifier_Literal(pp, st);
     case 'P':
 	return ApplyModifier_Path(pp, st);
     case '!':
 	return ApplyModifier_ShellCommand(pp, st);
     case '[':
 	return ApplyModifier_Words(pp, st);
     case 'g':
 	return ApplyModifier_Gmtime(pp, st);
     case 'h':
 	return ApplyModifier_Hash(pp, st);
     case 'l':
 	return ApplyModifier_Localtime(pp, st);
     case 't':
 	return ApplyModifier_To(pp, st);
     case 'N':
     case 'M':
 	return ApplyModifier_Match(pp, st);
     case 'S':
 	return ApplyModifier_Subst(pp, st);
     case '?':
 	return ApplyModifier_IfElse(pp, st);
 #ifndef NO_REGEX
     case 'C':
 	return ApplyModifier_Regex(pp, st);
 #endif
     case 'q':
     case 'Q':
 	return ApplyModifier_Quote(pp, st);
     case 'T':
 	return ApplyModifier_WordFunc(pp, st, ModifyWord_Tail);
     case 'H':
 	return ApplyModifier_WordFunc(pp, st, ModifyWord_Head);
     case 'E':
 	return ApplyModifier_WordFunc(pp, st, ModifyWord_Suffix);
     case 'R':
 	return ApplyModifier_WordFunc(pp, st, ModifyWord_Root);
     case 'r':
 	return ApplyModifier_Range(pp, st);
     case 'O':
 	return ApplyModifier_Order(pp, st);
     case 'u':
 	return ApplyModifier_Unique(pp, st);
 #ifdef SUNSHCMD
     case 's':
 	return ApplyModifier_SunShell(pp, st);
 #endif
     default:
 	return AMR_UNKNOWN;
+    }
+}
 /* Apply any modifiers (such as :Mpattern or :@var@loop@ or :Q or ::=value). */
 static char *
 ApplyModifiers(
     const char **pp,		/* the parsing position, updated upon return */
     char *val,			/* the current value of the variable */
     char const startc,		/* '(' or '{', or '\0' for indirect modifiers */
     char const endc,		/* ')' or '}', or '\0' for indirect modifiers */
     Var * const v,
     VarExprFlags *exprFlags,
     GNode * const ctxt,		/* for looking up and modifying variables */
     VarEvalFlags const eflags,
     void ** const freePtr	/* free this after using the return value */
 ) {
     ApplyModifiersState st = {
 	startc, endc, v, ctxt, eflags, val,
 	var_Error,		/* .newVal */
 	' ',			/* .sep */
 	FALSE,			/* .oneBigWord */
 	*exprFlags		/* .exprFlags */
     };
     const char *p;
     const char *mod;
     ApplyModifierResult res;
     assert(startc == '(' || startc == '{' || startc == '\0');
     assert(endc == ')' || endc == '}' || endc == '\0');
     assert(val != NULL);
     p = *pp;
     while (*p != '\0' && *p != endc) {
 	if (*p == '$') {
 	    /*
 	     * We may have some complex modifiers in a variable.
 	     */
 	    const char *nested_p = p;
 	    void *freeIt;
 	    const char *rval;
 	    char c;
 	    (void)Var_Parse(&nested_p, st.ctxt, st.eflags, &rval, &freeIt);
 	    /* TODO: handle errors */
 	    /*
 	     * If we have not parsed up to st.endc or ':', we are not
 	     * interested.  This means the expression ${VAR:${M_1}${M_2}}
 	     * is not accepted, but ${VAR:${M_1}:${M_2}} is.
 	     */
 	    if (rval[0] != '\0' &&
 		(c = *nested_p) != '\0' && c != ':' && c != st.endc) {
 		if (DEBUG(LINT))
 		    Parse_Error(PARSE_FATAL,
 				"Missing delimiter ':' after indirect modifier \"%.*s\"",
 				(int)(nested_p - p), p);
 		free(freeIt);
 		/* XXX: apply_mods doesn't sound like "not interested". */
 		/* XXX: Why is the indirect modifier parsed again by
 		 * apply_mods?  If any, p should be advanced to nested_p. */
 		goto apply_mods;
+	    }
 	    VAR_DEBUG3("Indirect modifier \"%s\" from \"%.*s\"\n",
 		       rval, (int)(size_t)(nested_p - p), p);
 	    p = nested_p;
 	    if (rval[0] != '\0') {
 		const char *rval_pp = rval;
 		st.val = ApplyModifiers(&rval_pp, st.val, '\0', '\0', v,
 					&st.exprFlags, ctxt, eflags, freePtr);
 		if (st.val == var_Error
 		    || (st.val == varUndefined && !(st.eflags & VARE_UNDEFERR))
 		    || *rval_pp != '\0') {
 		    free(freeIt);
 		    goto out;	/* error already reported */
+		}
+	    }
 	    free(freeIt);
 	    if (*p == ':')
 		p++;
 	    else if (*p == '\0' && endc != '\0') {
 		Error("Unclosed variable specification after complex "
 		      "modifier (expecting '%c') for %s", st.endc, st.v->name);
 		goto out;
+	    }
 	    continue;
+	}
     apply_mods:
 	st.newVal = var_Error;	/* default value, in case of errors */
 	mod = p;
 	if (DEBUG(VAR))
 	    LogBeforeApply(&st, mod, endc);
 	res = ApplyModifier(&p, &st);
 #ifdef SYSVVARSUB
 	if (res == AMR_UNKNOWN) {
 	    assert(p == mod);
 	    res = ApplyModifier_SysV(&p, &st);
+	}
 #endif
 	if (res == AMR_UNKNOWN) {
 	    Error("Unknown modifier '%c'", *mod);
 	    for (p++; *p != ':' && *p != st.endc && *p != '\0'; p++)
 		continue;
 	    st.newVal = var_Error;
+	}
 	if (res == AMR_CLEANUP)
 	    goto cleanup;
 	if (res == AMR_BAD)
 	    goto bad_modifier;
 	if (DEBUG(VAR))
 	    LogAfterApply(&st, p, mod);
 	if (st.newVal != st.val) {
 	    if (*freePtr) {
 		free(st.val);
 		*freePtr = NULL;
+	    }
 	    st.val = st.newVal;
 	    if (st.val != var_Error && st.val != varUndefined &&
 		st.val != emptyString) {
 		*freePtr = st.val;
+	    }
+	}
 	if (*p == '\0' && st.endc != '\0') {
 	    Error("Unclosed variable specification (expecting '%c') "
 		  "for \"%s\" (value \"%s\") modifier %c",
 		  st.endc, st.v->name, st.val, *mod);
 	} else if (*p == ':') {
 	    p++;
 	} else if (DEBUG(LINT) && *p != '\0' && *p != endc) {
 	    Parse_Error(PARSE_FATAL,
 			"Missing delimiter ':' after modifier \"%.*s\"",
 			(int)(p - mod), mod);
+	}
+    }
 out:
     *pp = p;
     assert(st.val != NULL);	/* Use var_Error or varUndefined instead. */
     *exprFlags = st.exprFlags;
     return st.val;
 bad_modifier:
     Error("Bad modifier `:%.*s' for %s",
 	  (int)strcspn(mod, ":)}"), mod, st.v->name);
 cleanup:
     *pp = p;
     free(*freePtr);
     *freePtr = NULL;
     *exprFlags = st.exprFlags;
     return var_Error;
+}
 static Boolean
 VarIsDynamic(GNode *ctxt, const char *varname, size_t namelen)
+{
     if ((namelen == 1 ||
 	 (namelen == 2 && (varname[1] == 'F' || varname[1] == 'D'))) &&
 	(ctxt == VAR_CMDLINE || ctxt == VAR_GLOBAL))
+    {
 	/*
 	 * If substituting a local variable in a non-local context,
 	 * assume it's for dynamic source stuff. We have to handle
 	 * this specially and return the longhand for the variable
 	 * with the dollar sign escaped so it makes it back to the
 	 * caller. Only four of the local variables are treated
 	 * specially as they are the only four that will be set
 	 * when dynamic sources are expanded.
 	 */
 	switch (varname[0]) {
 	case '@':
 	case '%':
 	case '*':
 	case '!':
 	    return TRUE;
+	}
 	return FALSE;
+    }
     if ((namelen == 7 || namelen == 8) && varname[0] == '.' &&
 	ch_isupper(varname[1]) && (ctxt == VAR_CMDLINE || ctxt == VAR_GLOBAL))
+    {
 	return strcmp(varname, ".TARGET") == 0 ||
 	       strcmp(varname, ".ARCHIVE") == 0 ||
 	       strcmp(varname, ".PREFIX") == 0 ||
 	       strcmp(varname, ".MEMBER") == 0;
+    }
     return FALSE;
+}
 static const char *
 UndefinedShortVarValue(char varname, const GNode *ctxt, VarEvalFlags eflags)
+{
     if (ctxt == VAR_CMDLINE || ctxt == VAR_GLOBAL) {
 	/*
 	 * If substituting a local variable in a non-local context,
 	 * assume it's for dynamic source stuff. We have to handle
 	 * this specially and return the longhand for the variable
 	 * with the dollar sign escaped so it makes it back to the
 	 * caller. Only four of the local variables are treated
 	 * specially as they are the only four that will be set
 	 * when dynamic sources are expanded.
 	 */
 	switch (varname) {
 	case '@':
 	    return "$(.TARGET)";
 	case '%':
 	    return "$(.MEMBER)";
 	case '*':
 	    return "$(.PREFIX)";
 	case '!':
 	    return "$(.ARCHIVE)";
+	}
+    }
     return eflags & VARE_UNDEFERR ? var_Error : varUndefined;
+}
 /* Parse a variable name, until the end character or a colon, whichever
  * comes first. */
 static char *
 ParseVarname(const char **pp, char startc, char endc,
 	     GNode *ctxt, VarEvalFlags eflags,
 	     size_t *out_varname_len)
+{
     Buffer buf;
     const char *p = *pp;
     int depth = 1;
     Buf_Init(&buf, 0);
     while (*p != '\0') {
 	/* Track depth so we can spot parse errors. */
 	if (*p == startc)
 	    depth++;
 	if (*p == endc) {
 	    if (--depth == 0)
 		break;
+	}
 	if (*p == ':' && depth == 1)
 	    break;
 	/* A variable inside a variable, expand. */
 	if (*p == '$') {
 	    void *freeIt;
 	    const char *rval;
 	    (void)Var_Parse(&p, ctxt, eflags, &rval, &freeIt);
 	    /* TODO: handle errors */
 	    Buf_AddStr(&buf, rval);
 	    free(freeIt);
 	} else {
 	    Buf_AddByte(&buf, *p);
 	    p++;
+	}
+    }
     *pp = p;
     *out_varname_len = Buf_Len(&buf);
     return Buf_Destroy(&buf, FALSE);
+}
 static Boolean
 ValidShortVarname(char varname, const char *start)
+{
     switch (varname) {
     case '\0':
     case ')':
     case '}':
     case ':':
     case '$':
 	break;			/* and continue below */
     default:
 	return TRUE;
+    }
     if (!DEBUG(LINT))
 	return FALSE;
     if (varname == '$')
 	Parse_Error(PARSE_FATAL,
 		    "To escape a dollar, use \\$, not $$, at \"%s\"", start);
     else if (varname == '\0')
 	Parse_Error(PARSE_FATAL, "Dollar followed by nothing");
     else
 	Parse_Error(PARSE_FATAL,
 		    "Invalid variable name '%c', at \"%s\"", varname, start);
     return FALSE;
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Parse --
  *	Given the start of a variable expression (such as $v, $(VAR),
  *	${VAR:Mpattern}), extract the variable name, possibly some
  *	modifiers and find its value by applying the modifiers to the
  *	original value.
+ *
  *	When parsing a condition in ParseEmptyArg, pp may also point to
  *	the "y" of "empty(VARNAME:Modifiers)", which is syntactically
  *	identical.
+ *
  * Input:
  *	str		The string to parse
  *	ctxt		The context for the variable
  *	flags		VARE_UNDEFERR	if undefineds are an error
  *			VARE_WANTRES	if we actually want the result
  *			VARE_ASSIGN	if we are in a := assignment
  *	lengthPtr	OUT: The length of the specification
  *	freePtr		OUT: Non-NULL if caller should free *freePtr
+ *
  * Results:
  *	Returns the value of the variable expression, never NULL.
  *	Returns var_Error if there was a parse error and VARE_UNDEFERR was
  *	set.
  *	Returns varUndefined if there was an undefined variable and
  *	VARE_UNDEFERR was not set.
+ *
  *	Parsing should continue at *pp.
  *	TODO: Document the value of *pp on parse errors.  It might be advanced
  *	by 0, or +1, or the index of the parse error, or the guessed end of the
  *	variable expression.
+ *
  *	If var_Error is returned, a diagnostic may or may not have been
  *	printed. XXX: This is inconsistent.
+ *
  *	If varUndefined is returned, a diagnostic may or may not have been
  *	printed. XXX: This is inconsistent.
+ *
  *	After using the returned value, *freePtr must be freed, preferably
  *	using bmake_free since it is NULL in most cases.
+ *
  * Side Effects:
  *	Any effects from the modifiers, such as :!cmd! or ::=value.
  *-----------------------------------------------------------------------
  */
 /* coverity[+alloc : arg-*4] */
 VarParseResult
 Var_Parse(const char **pp, GNode *ctxt, VarEvalFlags eflags,
 	  const char **out_val, void **freePtr)
+{
     const char *const start = *pp;
     const char *p;
     Boolean haveModifier;	/* TRUE if have modifiers for the variable */
     char startc;		/* Starting character if variable in parens
 				 * or braces */
     char endc;			/* Ending character if variable in parens
 				 * or braces */
     Boolean dynamic;		/* TRUE if the variable is local and we're
 				 * expanding it in a non-local context. This
 				 * is done to support dynamic sources. The
 				 * result is just the expression, unaltered */
     const char *extramodifiers;
     Var *v;
     char *nstr;
     char eflags_str[VarEvalFlags_ToStringSize];
     VarExprFlags exprFlags = 0;
     VAR_DEBUG3("%s: %s with %s\n", __func__, start,
 	       Enum_FlagsToString(eflags_str, sizeof eflags_str, eflags,
 				  VarEvalFlags_ToStringSpecs));
     *freePtr = NULL;
     extramodifiers = NULL;	/* extra modifiers to apply first */
     dynamic = FALSE;
     /* Appease GCC, which thinks that the variable might not be
      * initialized. */
     endc = '\0';
     startc = start[1];
     if (startc != '(' && startc != '{') {
 	char name[2];
 	/*
 	 * If it's not bounded by braces of some sort, life is much simpler.
 	 * We just need to check for the first character and return the
 	 * value if it exists.
 	 */
 	if (!ValidShortVarname(startc, start)) {
 	    (*pp)++;
 	    *out_val = var_Error;
 	    return VPR_PARSE_MSG;
+	}
 	name[0] = startc;
 	name[1] = '\0';
 	v = VarFind(name, ctxt, TRUE);
 	if (v == NULL) {
 	    *pp += 2;
 	    *out_val = UndefinedShortVarValue(startc, ctxt, eflags);
 	    if (DEBUG(LINT) && *out_val == var_Error) {
 		Parse_Error(PARSE_FATAL, "Variable \"%s\" is undefined", name);
 		return VPR_UNDEF_MSG;
+	    }
 	    return eflags & VARE_UNDEFERR ? VPR_UNDEF_SILENT : VPR_OK;
 	} else {
 	    haveModifier = FALSE;
 	    p = start + 1;
+	}
     } else {
 	size_t namelen;
 	char *varname;
 	endc = startc == '(' ? ')' : '}';
 	p = start + 2;
 	varname = ParseVarname(&p, startc, endc, ctxt, eflags, &namelen);
 	if (*p == ':') {
 	    haveModifier = TRUE;
 	} else if (*p == endc) {
 	    haveModifier = FALSE;
 	} else {
 	    Parse_Error(PARSE_FATAL, "Unclosed variable \"%s\"", varname);
 	    *pp = p;
 	    free(varname);
 	    *out_val = var_Error;
 	    return VPR_PARSE_MSG;
+	}
 	v = VarFind(varname, ctxt, TRUE);
 	/* At this point, p points just after the variable name,
 	 * either at ':' or at endc. */
 	/*
 	 * Check also for bogus D and F forms of local variables since we're
 	 * in a local context and the name is the right length.
 	 */
 	if (v == NULL && ctxt != VAR_CMDLINE && ctxt != VAR_GLOBAL &&
 	    namelen == 2 && (varname[1] == 'F' || varname[1] == 'D') &&
 	    strchr("@%?*!<>", varname[0]) != NULL)
+	{
 	    /*
 	     * Well, it's local -- go look for it.
 	     */
 	    char name[] = { varname[0], '\0' };
 	    v = VarFind(name, ctxt, 0);
 	    if (v != NULL) {
 		if (varname[1] == 'D') {
 		    extramodifiers = "H:";
 		} else { /* F */
 		    extramodifiers = "T:";
+		}
+	    }
+	}
 	if (v == NULL) {
 	    dynamic = VarIsDynamic(ctxt, varname, namelen);
 	    if (!haveModifier) {
 		p++;		/* skip endc */
 		*pp = p;
 		if (dynamic) {
 		    char *pstr = bmake_strsedup(start, p);
 		    *freePtr = pstr;
 		    free(varname);
 		    *out_val = pstr;
 		    return VPR_OK;
+		}
 		if ((eflags & VARE_UNDEFERR) && (eflags & VARE_WANTRES) &&
 		    DEBUG(LINT))
+		{
 		    Parse_Error(PARSE_FATAL, "Variable \"%s\" is undefined",
 				varname);
 		    free(varname);
 		    *out_val = var_Error;
 		    return VPR_UNDEF_MSG;
+		}
 		if (eflags & VARE_UNDEFERR) {
 		    free(varname);
 		    *out_val = var_Error;
 		    return VPR_UNDEF_SILENT;
+		}
 		free(varname);
 		*out_val = varUndefined;
 		return VPR_OK;
+	    }
 	    /* The variable expression is based on an undefined variable.
 	     * Nevertheless it needs a Var, for modifiers that access the
 	     * variable name, such as :L or :?.
+	     *
 	     * Most modifiers leave this expression in the "undefined" state
 	     * (VEF_UNDEF), only a few modifiers like :D, :U, :L, :P turn this
 	     * undefined expression into a defined expression (VEF_DEF).
+	     *
 	     * At the end, after applying all modifiers, if the expression
 	     * is still undefined, Var_Parse will return an empty string
 	     * instead of the actually computed value. */
 	    v = VarNew(varname, varname, "", 0);
 	    exprFlags = VEF_UNDEF;
 	} else
 	    free(varname);
+    }
-    if (v->flags & VAR_IN_USE) {
+    if (v->flags & VAR_IN_USE)
 	Fatal("Variable %s is recursive.", v->name);
 	/*NOTREACHED*/
     } else {
 	v->flags |= VAR_IN_USE;
     /*
      * Before doing any modification, we have to make sure the value
      * has been fully expanded. If it looks like recursion might be
      * necessary (there's a dollar sign somewhere in the variable's value)
      * we just call Var_Subst to do any other substitutions that are
      * necessary. Note that the value returned by Var_Subst will have
      * been dynamically-allocated, so it will need freeing when we
      * return.
      */
     nstr = Buf_GetAll(&v->val, NULL);
     if (strchr(nstr, '$') != NULL && (eflags & VARE_WANTRES)) {
 	VarEvalFlags nested_eflags = eflags;
 	if (DEBUG(LINT))
 	    nested_eflags &= ~(unsigned)VARE_UNDEFERR;
 	v->flags |= VAR_IN_USE;
 	(void)Var_Subst(nstr, ctxt, nested_eflags, &nstr);
 	v->flags &= ~(unsigned)VAR_IN_USE;
 	/* TODO: handle errors */
 	*freePtr = nstr;
+    }
     v->flags &= ~(unsigned)VAR_IN_USE;
     if (haveModifier || extramodifiers != NULL) {
 	void *extraFree;
 	extraFree = NULL;
 	if (extramodifiers != NULL) {
 	    const char *em = extramodifiers;
 	    nstr = ApplyModifiers(&em, nstr, '(', ')',
 				  v, &exprFlags, ctxt, eflags, &extraFree);
+	}
 	if (haveModifier) {
 	    /* Skip initial colon. */
 	    p++;
 	    nstr = ApplyModifiers(&p, nstr, startc, endc,
 				  v, &exprFlags, ctxt, eflags, freePtr);
 	    free(extraFree);
 	} else {
 	    *freePtr = extraFree;
+	}
+    }
     if (*p != '\0')		/* Skip past endc if possible. */
 	p++;
     *pp = p;
     if (v->flags & VAR_FROM_ENV) {
 	/* Free the environment variable now since we own it,
 	 * but don't free the variable value if it will be returned. */
 	Boolean keepValue = nstr == Buf_GetAll(&v->val, NULL);
 	if (keepValue)
 	    *freePtr = nstr;
 	(void)VarFreeEnv(v, !keepValue);
     } else if (exprFlags & VEF_UNDEF) {
 	if (!(exprFlags & VEF_DEF)) {
 	    if (*freePtr != NULL) {
 		free(*freePtr);
 		*freePtr = NULL;
+	    }
 	    if (dynamic) {
 		nstr = bmake_strsedup(start, p);
 		*freePtr = nstr;
 	    } else {
 		/* The expression is still undefined, therefore discard the
 		 * actual value and return an error marker instead. */
 		nstr = (eflags & VARE_UNDEFERR) ? var_Error : varUndefined;
+	    }
+	}
 	if (nstr != Buf_GetAll(&v->val, NULL))
 	    Buf_Destroy(&v->val, TRUE);
 	free(v->name_freeIt);
 	free(v);
+    }
     *out_val = nstr;
     return VPR_UNKNOWN;
+}
 /* Substitute for all variables in the given string in the given context.
+ *
  * If eflags & VARE_UNDEFERR, Parse_Error will be called when an undefined
  * variable is encountered.
+ *
  * If eflags & VARE_WANTRES, any effects from the modifiers, such as ::=,
  * :sh or !cmd! take place.
+ *
  * Input:
  *	str		the string which to substitute
  *	ctxt		the context wherein to find variables
  *	eflags		VARE_UNDEFERR	if undefineds are an error
  *			VARE_WANTRES	if we actually want the result
  *			VARE_ASSIGN	if we are in a := assignment
+ *
  * Results:
  *	The resulting string.
  */
 VarParseResult
 Var_Subst(const char *str, GNode *ctxt, VarEvalFlags eflags, char **out_res)
+{
     const char *p = str;
     Buffer buf;			/* Buffer for forming things */
     /* Set true if an error has already been reported,
      * to prevent a plethora of messages when recursing */
     static Boolean errorReported;
     Buf_Init(&buf, 0);
     errorReported = FALSE;
     while (*p != '\0') {
 	if (p[0] == '$' && p[1] == '$') {
 	    /* A dollar sign may be escaped with another dollar sign. */
 	    if (save_dollars && (eflags & VARE_ASSIGN))
 		Buf_AddByte(&buf, '$');
 	    Buf_AddByte(&buf, '$');
 	    p += 2;
 	} else if (*p != '$') {
 	    /*
 	     * Skip as many characters as possible -- either to the end of
 	     * the string or to the next dollar sign (variable expression).
 	     */
 	    const char *plainStart = p;
 	    for (p++; *p != '$' && *p != '\0'; p++)
 		continue;
 	    Buf_AddBytesBetween(&buf, plainStart, p);
 	} else {
 	    const char *nested_p = p;
 	    void *freeIt;
 	    const char *val;
 	    (void)Var_Parse(&nested_p, ctxt, eflags, &val, &freeIt);
 	    /* TODO: handle errors */
 	    if (val == var_Error || val == varUndefined) {
 		/*
 		 * If performing old-time variable substitution, skip over
 		 * the variable and continue with the substitution. Otherwise,
 		 * store the dollar sign and advance str so we continue with
 		 * the string...
 		 */
 		if (oldVars) {
 		    p = nested_p;
 		} else if ((eflags & VARE_UNDEFERR) || val == var_Error) {
 		    /*
 		     * If variable is undefined, complain and skip the
 		     * variable. The complaint will stop us from doing anything
 		     * when the file is parsed.
 		     */
 		    if (!errorReported) {
 			Parse_Error(PARSE_FATAL, "Undefined variable \"%.*s\"",
 				    (int)(size_t)(nested_p - p), p);
+		    }
 		    p = nested_p;
 		    errorReported = TRUE;
 		} else {
 		    /* Copy the initial '$' of the undefined expression,
 		     * thereby deferring expansion of the expression, but
 		     * expand nested expressions if already possible.
 		     * See unit-tests/varparse-undef-partial.mk. */
 		    Buf_AddByte(&buf, *p);
 		    p++;
+		}
 	    } else {
 		p = nested_p;
 		Buf_AddStr(&buf, val);
+	    }
 	    free(freeIt);
 	    freeIt = NULL;
+	}
+    }
     *out_res = Buf_DestroyCompact(&buf);
     return VPR_OK;
+}
 /* Initialize the variables module. */
 void
 Var_Init(void)
+{
     VAR_INTERNAL = Targ_NewGN("Internal");
     VAR_GLOBAL = Targ_NewGN("Global");
     VAR_CMDLINE = Targ_NewGN("Command");
+}
 /* Clean up the variables module. */
 void
 Var_End(void)
+{
     Var_Stats();
+}
 void
 Var_Stats(void)
+{
     HashTable_DebugStats(&VAR_GLOBAL->context, "VAR_GLOBAL");
+}
 /* Print all variables in a context, sorted by name. */
 void
 Var_Dump(GNode *ctxt)
+{
     Vector /* of const char * */ vec;
     HashIter hi;
     size_t i;
     const char **varnames;
     Vector_Init(&vec, sizeof(const char *));
     HashIter_Init(&hi, &ctxt->context);
     while (HashIter_Next(&hi) != NULL)
 	*(const char **)Vector_Push(&vec) = hi.entry->key;
     varnames = vec.items;
     qsort(varnames, vec.len, sizeof varnames[0], str_cmp_asc);
     for (i = 0; i < vec.len; i++) {
 	const char *varname = varnames[i];
 	Var *var = HashTable_FindValue(&ctxt->context, varname);
 	debug_printf("%-16s = %s\n", varname, Buf_GetAll(&var->val, NULL));
+    }
     Vector_Done(&vec);
+}