 @@ -1,1859 +1,1860 @@
-/*	$NetBSD: var.c,v 1.592 2020/10/30 06:44:57 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.593 2020/10/30 06:59:12 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.592 2020/10/30 06:44:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.593 2020/10/30 06:59:12 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 we consume $$ during := like any other expansion.
+ * Traditionally this make consumed $$ during := like any other expansion.
- * Other make's do not.
+ * 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 SAVE_DOLLARS ".MAKE.SAVE_DOLLARS"
+#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 Makefile are located in
  *	    the global context.
  *	3) the command-line context. All variables set on the command line
  *	   are placed in this context. They are UNALTERABLE once placed here.
  *	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_CMD;	/* variables defined on the command-line */
 typedef enum VarFindFlags {
     FIND_CMD		= 0x01,	/* look in VAR_CMD when searching */
     FIND_GLOBAL		= 0x02,	/* look in VAR_GLOBAL as well */
     FIND_ENV		= 0x04	/* look in the environment also */
 } VarFindFlags;
 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 command line. */
     VAR_FROM_CMD = 0x40,
     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_YES,
     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,	/* Apply substitution globally */
     VARP_SUB_ONE	= 0x02,	/* Apply substitution to one word */
     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);
+}
 /*-
  *-----------------------------------------------------------------------
  * VarFind --
  *	Find the given variable in the given context and any other contexts
  *	indicated.
+ *
  * Input:
  *	name		name to find
  *	ctxt		context in which to find it
  *	flags		FIND_GLOBAL	look in VAR_GLOBAL as well
  *			FIND_CMD	look in VAR_CMD as well
  *			FIND_ENV	look in the environment as well
+ *
  * Results:
  *	A pointer to the structure describing the desired variable or
  *	NULL if the variable does not exist.
  *-----------------------------------------------------------------------
  */
 static Var *
 VarFind(const char *name, GNode *ctxt, VarFindFlags flags)
+{
     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. If it's not there,
      * look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,
      * depending on the FIND_* flags in 'flags'
      */
     var = GNode_FindVar(ctxt, name, nameHash);
     if (var == NULL && (flags & FIND_CMD) && ctxt != VAR_CMD)
 	var = GNode_FindVar(VAR_CMD, name, nameHash);
     if (!opts.checkEnvFirst && var == NULL && (flags & FIND_GLOBAL) &&
 	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 && (flags & FIND_ENV)) {
 	char *env;
 	if ((env = getenv(name)) != NULL) {
 	    char *varname = bmake_strdup(name);
 	    return VarNew(varname, varname, env, VAR_FROM_ENV);
+	}
 	if (opts.checkEnvFirst && (flags & FIND_GLOBAL) && 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;
+}
 /*-
  *-----------------------------------------------------------------------
  * VarFreeEnv  --
  *	If the variable is an environment variable, free it
+ *
  * Input:
  *	v		the variable
  *	destroy		true if the value buffer should be destroyed.
+ *
  * Results:
  *	TRUE if it is an environment variable, FALSE otherwise.
  *-----------------------------------------------------------------------
  */
 static Boolean
 VarFreeEnv(Var *v, Boolean destroy)
+{
     if (!(v->flags & VAR_FROM_ENV))
 	return FALSE;
     free(v->name_freeIt);
     Buf_Destroy(&v->val, destroy);
     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, 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 the Var structure as well. */
 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);
+    }
+}
 /*
  * 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 (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;
+	}
+    }
     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 this as something we need to re-export.
 	     * No point actually exporting it now though,
 	     * the child 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;
+	}
 	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 children.
  */
 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;
         HashEntry *he;
 	/* Ouch! Exporting all variables at once is crazy... */
 	HashIter_Init(&hi, &VAR_GLOBAL->context);
 	while ((he = HashIter_Next(&hi)) != NULL) {
 	    Var *var = HashEntry_Get(he);
 	    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_ALL)
 		    var_exportedVars = VAR_EXPORTED_YES;
 		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) {
 		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_CMD, 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_CMD && !(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.
 	     */
 	    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);
 	if (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_CMD && !(flags & VAR_NO_EXPORT) && name[0] != '.') {
 	if (v == NULL) {
 	    /* we just added it */
 	    v = VarFind(name, ctxt, 0);
+	}
 	if (v != NULL)
 	    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 ? val : "", 1);
 	Var_Append(MAKEOVERRIDES, name, VAR_GLOBAL);
+    }
-    if (name[0] == '.' && strcmp(name, SAVE_DOLLARS) == 0)
+    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 variable to set
  *	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_CMD, only
  *	VAR_CMD->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_CMD 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 variable to modify
  *	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 ? (FIND_CMD | FIND_ENV) : 0);
     if (v == NULL) {
 	Var_Set(name, val, ctxt);
     } else if (ctxt == VAR_CMD || !(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
  *	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, FIND_CMD | FIND_GLOBAL | FIND_ENV);
     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
  *	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, char **freeIt)
+{
     Var *v = VarFind(name, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
     char *p;
     *freeIt = NULL;
     if (v == NULL)
 	return NULL;
     p = Buf_GetAll(&v->val, NULL);
     if (VarFreeEnv(v, FALSE))
 	*freeIt = p;
     return p;
+}
 /* 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 an expression and
  * typically adds a modification of this word to the buffer. It may also do
  * nothing or add several words. */
 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
 ModifyWord_Root(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
+{
     const char *dot = strrchr(word, '.');
     size_t len = dot != NULL ? (size_t)(dot - word) : strlen(word);
     SepBuf_AddBytes(buf, word, len);
+}
 /* Callback for ModifyWords to implement the :M modifier.
  * Place the word in the buffer if it matches the given pattern. */
 static void
 ModifyWord_Match(const char *word, SepBuf *buf, void *data)
+{
     const char *pattern = data;
     VAR_DEBUG2("VarMatch [%s] [%s]\n", word, pattern);
     if (Str_Match(word, pattern))
 	SepBuf_AddStr(buf, word);
+}
 /* Callback for ModifyWords to implement the :N modifier.
  * Place the word in the buffer if it doesn't match the given pattern. */
 static void
 ModifyWord_NoMatch(const char *word, SepBuf *buf, void *data)
+{
     const char *pattern = data;
     if (!Str_Match(word, pattern))
 	SepBuf_AddStr(buf, word);
+}
 #ifdef SYSVVARSUB
 /*-
  *-----------------------------------------------------------------------
  * Str_SYSVMatch --
  *	Check word against pattern for a match (% is wild),
+ *
  * Input:
  *	word		Word to examine
  *	pattern		Pattern to examine against
+ *
  * Results:
  *	Returns the start of the match, or NULL.
  *	*match_len returns the length of the match, if any.
  *	*hasPercent returns whether the pattern contains a percent.
  *-----------------------------------------------------------------------
  */
 static const char *
 Str_SYSVMatch(const char *word, const char *pattern, size_t *match_len,
 	      Boolean *hasPercent)
+{
     const char *p = pattern;
     const char *w = word;
     const char *percent;
     size_t w_len;
     size_t p_len;
     const char *w_tail;
     *hasPercent = FALSE;
     if (*p == '\0') {		/* ${VAR:=suffix} */
 	*match_len = strlen(w);	/* Null pattern is the whole string */
 	return w;
+    }
     percent = strchr(p, '%');
     if (percent != NULL) {	/* ${VAR:...%...=...} */
 	*hasPercent = TRUE;
 	if (*w == '\0')
 	    return NULL;	/* empty word does not match pattern */
 	/* check that the prefix matches */
 	for (; p != percent && *w != '\0' && *w == *p; w++, p++)
 	    continue;
 	if (p != percent)
 	    return NULL;	/* No match */
 	p++;			/* Skip the percent */
 	if (*p == '\0') {
 	    /* No more pattern, return the rest of the string */
 	    *match_len = strlen(w);
 	    return w;
+	}
+    }
     /* Test whether the tail matches */
     w_len = strlen(w);
     p_len = strlen(p);
     if (w_len < p_len)
 	return NULL;
     w_tail = w + w_len - p_len;
     if (memcmp(p, w_tail, p_len) != 0)
 	return NULL;
     *match_len = (size_t)(w_tail - w);
     return w;
+}
 struct ModifyWord_SYSVSubstArgs {
     GNode *ctx;
     const char *lhs;
     const char *rhs;
 };
 /* Callback for ModifyWords to implement the :%.from=%.to modifier. */
 static void
 ModifyWord_SYSVSubst(const char *word, SepBuf *buf, void *data)
+{
     const struct ModifyWord_SYSVSubstArgs *args = data;
     char *rhs_expanded;
     const char *rhs;
     const char *percent;
     size_t match_len;
     Boolean lhsPercent;
     const char *match = Str_SYSVMatch(word, args->lhs, &match_len, &lhsPercent);
     if (match == NULL) {
 	SepBuf_AddStr(buf, word);
 	return;
+    }
     /* Append rhs to the buffer, substituting the first '%' with the
      * match, but only if the lhs had a '%' as well. */
     (void)Var_Subst(args->rhs, args->ctx, VARE_WANTRES, &rhs_expanded);
     /* TODO: handle errors */
     rhs = rhs_expanded;
     percent = strchr(rhs, '%');
     if (percent != NULL && lhsPercent) {
 	/* Copy the prefix of the replacement pattern */
 	SepBuf_AddBytesBetween(buf, rhs, percent);
 	rhs = percent + 1;
+    }
     if (percent != NULL || !lhsPercent)
 	SepBuf_AddBytes(buf, match, match_len);
     /* Append the suffix of the replacement pattern */
     SepBuf_AddStr(buf, rhs);
     free(rhs_expanded);
+}
 #endif
 struct ModifyWord_SubstArgs {
     const char	*lhs;
     size_t	lhsLen;
     const char	*rhs;
     size_t	rhsLen;
     VarPatternFlags pflags;
     Boolean	matched;
 };
 /* Callback for ModifyWords to implement the :S,from,to, modifier.
  * Perform a string substitution on the given word. */
 static void
 ModifyWord_Subst(const char *word, SepBuf *buf, void *data)
+{
     size_t wordLen = strlen(word);
     struct ModifyWord_SubstArgs *args = data;
     const char *match;
     if ((args->pflags & VARP_SUB_ONE) && args->matched)
 	goto nosub;
     if (args->pflags & VARP_ANCHOR_START) {
 	if (wordLen < args->lhsLen ||
 	    memcmp(word, args->lhs, args->lhsLen) != 0)
 	    goto nosub;
 	if (args->pflags & VARP_ANCHOR_END) {
 	    if (wordLen != args->lhsLen)
 		goto nosub;
 	    /* :S,^whole$,replacement, */
 	    SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
 	    args->matched = TRUE;
 	} else {
 	    /* :S,^prefix,replacement, */
 	    SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
 	    SepBuf_AddBytes(buf, word + args->lhsLen, wordLen - args->lhsLen);
 	    args->matched = TRUE;
+	}
 	return;
+    }
     if (args->pflags & VARP_ANCHOR_END) {
 	const char *start;
 	if (wordLen < args->lhsLen)
 	    goto nosub;
 	start = word + (wordLen - args->lhsLen);
 	if (memcmp(start, args->lhs, args->lhsLen) != 0)
 	    goto nosub;
 	/* :S,suffix$,replacement, */
 	SepBuf_AddBytesBetween(buf, word, start);
 	SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
 	args->matched = TRUE;
 	return;
+    }
     if (args->lhs[0] == '\0')
 	goto nosub;
     /* unanchored case, may match more than once */
     while ((match = strstr(word, args->lhs)) != NULL) {
 	SepBuf_AddBytesBetween(buf, word, match);
 	SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
 	args->matched = TRUE;
 	wordLen -= (size_t)(match - word) + args->lhsLen;
 	word += (size_t)(match - word) + args->lhsLen;
 	if (wordLen == 0 || !(args->pflags & VARP_SUB_GLOBAL))
 	    break;
+    }
 nosub:
     SepBuf_AddBytes(buf, word, wordLen);
+}
 #ifndef NO_REGEX
 /* Print the error caused by a regcomp or regexec call. */
 static void
 VarREError(int reerr, regex_t *pat, const char *str)
+{
     size_t errlen = regerror(reerr, pat, 0, 0);
     char *errbuf = bmake_malloc(errlen);
     regerror(reerr, pat, errbuf, errlen);
     Error("%s: %s", str, errbuf);
     free(errbuf);
+}
 struct ModifyWord_SubstRegexArgs {
     regex_t re;
     size_t nsub;
     char *replace;
     VarPatternFlags pflags;
     Boolean matched;
 };
 /* Callback for ModifyWords to implement the :C/from/to/ modifier.
  * Perform a regex substitution on the given word. */
 static void
 ModifyWord_SubstRegex(const char *word, SepBuf *buf, void *data)
+{
     struct ModifyWord_SubstRegexArgs *args = data;
     int xrv;
     const char *wp = word;
     char *rp;
     int flags = 0;
     regmatch_t m[10];
     if ((args->pflags & VARP_SUB_ONE) && args->matched)
 	goto nosub;
 tryagain:
     xrv = regexec(&args->re, wp, args->nsub, m, flags);
     switch (xrv) {
     case 0:
 	args->matched = TRUE;
 	SepBuf_AddBytes(buf, wp, (size_t)m[0].rm_so);
 	for (rp = args->replace; *rp; rp++) {
 	    if (*rp == '\\' && (rp[1] == '&' || rp[1] == '\\')) {
 		SepBuf_AddBytes(buf, rp + 1, 1);
 		rp++;
 		continue;
+	    }
 	    if (*rp == '&') {
 		SepBuf_AddBytesBetween(buf, wp + m[0].rm_so, wp + m[0].rm_eo);
 		continue;
+	    }
 	    if (*rp != '\\' || !ch_isdigit(rp[1])) {
 		SepBuf_AddBytes(buf, rp, 1);
 		continue;
+	    }
 	    {			/* \0 to \9 backreference */
 		size_t n = (size_t)(rp[1] - '0');
 		rp++;
 		if (n >= args->nsub) {
 		    Error("No subexpression \\%zu", n);
 		} else if (m[n].rm_so == -1 && m[n].rm_eo == -1) {
 		    Error("No match for subexpression \\%zu", n);
 		} else {
 		    SepBuf_AddBytesBetween(buf, wp + m[n].rm_so,
 					   wp + m[n].rm_eo);
+		}
+	    }
+	}
 	wp += m[0].rm_eo;
 	if (args->pflags & VARP_SUB_GLOBAL) {
 	    flags |= REG_NOTBOL;
 	    if (m[0].rm_so == 0 && m[0].rm_eo == 0) {
 		SepBuf_AddBytes(buf, wp, 1);
 		wp++;
+	    }
 	    if (*wp)
 		goto tryagain;
+	}
 	if (*wp) {
 	    SepBuf_AddStr(buf, wp);
+	}
 	break;
     default:
 	VarREError(xrv, &args->re, "Unexpected regex error");
 	/* FALLTHROUGH */
     case REG_NOMATCH:
     nosub:
 	SepBuf_AddStr(buf, wp);
 	break;
+    }
+}
 #endif
 struct ModifyWord_LoopArgs {
     GNode	*ctx;
     char	*tvar;		/* name of temporary variable */
     char	*str;		/* string to expand */
     VarEvalFlags eflags;
 };
 /* Callback for ModifyWords to implement the :@var@...@ modifier of ODE make. */
 static void
 ModifyWord_Loop(const char *word, SepBuf *buf, void *data)
+{
     const struct ModifyWord_LoopArgs *args;
     char *s;
     if (word[0] == '\0')
 	return;
     args = data;
     Var_Set_with_flags(args->tvar, word, args->ctx, VAR_NO_EXPORT);
     (void)Var_Subst(args->str, args->ctx, args->eflags, &s);
     /* TODO: handle errors */
     VAR_DEBUG4("ModifyWord_Loop: in \"%s\", replace \"%s\" with \"%s\" "
 	       "to \"%s\"\n",
 	       word, args->tvar, args->str, s);
     if (s[0] == '\n' || Buf_EndsWith(&buf->buf, '\n'))
 	buf->needSep = FALSE;
     SepBuf_AddStr(buf, s);
     free(s);
+}
 /*-
  * Implements the :[first..last] modifier.
  * This is a special case of ModifyWords since we want to be able
  * to scan the list backwards if first > last.
  */
 static char *
 VarSelectWords(char sep, Boolean oneBigWord, const char *str, int first,
 	       int last)
+{
     Words words;
     int len, start, end, step;
     int i;
     SepBuf buf;
     SepBuf_Init(&buf, sep);
     if (oneBigWord) {
 	/* fake what Str_Words() would do if there were only one word */
 	words.len = 1;
 	words.words = bmake_malloc((words.len + 1) * sizeof(char *));
 	words.freeIt = bmake_strdup(str);
 	words.words[0] = words.freeIt;
 	words.words[1] = NULL;
     } else {
 	words = Str_Words(str, FALSE);
+    }
     /*
      * Now sanitize the given range.
      * If first or last are negative, convert them to the positive equivalents
      * (-1 gets converted to ac, -2 gets converted to (ac - 1), etc.).
      */
     len = (int)words.len;
     if (first < 0)
 	first += len + 1;
     if (last < 0)
 	last += len + 1;
     /*
      * We avoid scanning more of the list than we need to.
      */
     if (first > last) {
 	start = (first > len ? len : first) - 1;
 	end = last < 1 ? 0 : last - 1;
 	step = -1;
     } else {
 	start = first < 1 ? 0 : first - 1;
 	end = last > len ? len : last;
 	step = 1;
+    }
     for (i = start; (step < 0) == (i >= end); i += step) {
 	SepBuf_AddStr(&buf, words.words[i]);
 	SepBuf_Sep(&buf);
+    }
     Words_Free(words);
     return SepBuf_Destroy(&buf, FALSE);
+}
 /* Callback for ModifyWords to implement the :tA modifier.
  * Replace each word with the result of realpath() if successful. */
 static void
 ModifyWord_Realpath(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
+{
     struct stat st;
     char rbuf[MAXPATHLEN];
     const char *rp = cached_realpath(word, rbuf);
     if (rp != NULL && *rp == '/' && stat(rp, &st) == 0)
 	word = rp;
     SepBuf_AddStr(buf, word);
+}
 /*-
  *-----------------------------------------------------------------------
  * Modify each of the words of the passed string using the given function.
+ *
  * Input:
  *	str		String whose words should be modified
  *	modifyWord	Function that modifies a single word
  *	modifyWord_args Custom arguments for modifyWord
+ *
  * Results:
  *	A string of all the words modified appropriately.
  *-----------------------------------------------------------------------
  */
 static char *
 ModifyWords(GNode *ctx, char sep, Boolean oneBigWord, const char *str,
 	    ModifyWordsCallback modifyWord, void *modifyWord_args)
+{
     SepBuf result;
     Words words;
     size_t i;
     if (oneBigWord) {
 	SepBuf_Init(&result, sep);
 	modifyWord(str, &result, modifyWord_args);
 	return SepBuf_Destroy(&result, FALSE);
+    }
     SepBuf_Init(&result, sep);
     words = Str_Words(str, FALSE);
     VAR_DEBUG2("ModifyWords: split \"%s\" into %zu words\n", str, words.len);
     for (i = 0; i < words.len; i++) {
 	modifyWord(words.words[i], &result, modifyWord_args);
 	if (Buf_Len(&result.buf) > 0)
 	    SepBuf_Sep(&result);
+    }
     Words_Free(words);
     return SepBuf_Destroy(&result, FALSE);
+}
 static char *
 Words_JoinFree(Words words)
+{
     Buffer buf;
     size_t i;
     Buf_Init(&buf, 0);
     for (i = 0; i < words.len; i++) {
 	if (i != 0)
 	    Buf_AddByte(&buf, ' ');	/* XXX: st->sep, for consistency */
 	Buf_AddStr(&buf, words.words[i]);
+    }
     Words_Free(words);
     return Buf_Destroy(&buf, FALSE);
+}
 /* Remove adjacent duplicate words. */
 static char *
 VarUniq(const char *str)
+{
     Words words = Str_Words(str, FALSE);
     if (words.len > 1) {
 	size_t i, j;
 	for (j = 0, i = 1; i < words.len; i++)
 	    if (strcmp(words.words[i], words.words[j]) != 0 && (++j != i))
 		words.words[j] = words.words[i];
 	words.len = j + 1;
+    }
     return Words_JoinFree(words);
+}
 /* Quote shell meta-characters and space characters in the string.
  * If quoteDollar is set, also quote and double any '$' characters. */
 static char *
 VarQuote(const char *str, Boolean quoteDollar)
+{
     char *res;
     Buffer buf;
     Buf_Init(&buf, 0);
     for (; *str != '\0'; str++) {
 	if (*str == '\n') {
 	    const char *newline = Shell_GetNewline();
 	    if (newline == NULL)
 		newline = "\\\n";
 	    Buf_AddStr(&buf, newline);
 	    continue;
+	}
 	if (ch_isspace(*str) || ismeta((unsigned char)*str))
 	    Buf_AddByte(&buf, '\\');
 	Buf_AddByte(&buf, *str);
 	if (quoteDollar && *str == '$')
 	    Buf_AddStr(&buf, "\\$");
+    }
     res = Buf_Destroy(&buf, FALSE);
     VAR_DEBUG1("QuoteMeta: [%s]\n", res);
     return res;
+}
 /* Compute the 32-bit hash of the given string, using the MurmurHash3
  * algorithm. Output is encoded as 8 hex digits, in Little Endian order. */
 static char *
 VarHash(const char *str)
+{
     static const char    hexdigits[16] = "0123456789abcdef";
     const unsigned char *ustr = (const unsigned char *)str;
     uint32_t h  = 0x971e137bU;
     uint32_t c1 = 0x95543787U;
     uint32_t c2 = 0x2ad7eb25U;
     size_t len2 = strlen(str);
     char *buf;
     size_t i;
     size_t len;
     for (len = len2; len; ) {
 	uint32_t k = 0;
 	switch (len) {
 	default:
 	    k = ((uint32_t)ustr[3] << 24) |
 		((uint32_t)ustr[2] << 16) |
 		((uint32_t)ustr[1] << 8) |
 		(uint32_t)ustr[0];
 	    len -= 4;
 	    ustr += 4;
 	    break;
 	case 3:
 	    k |= (uint32_t)ustr[2] << 16;
 	    /* FALLTHROUGH */
 	case 2:
 	    k |= (uint32_t)ustr[1] << 8;
 	    /* FALLTHROUGH */
 	case 1:
 	    k |= (uint32_t)ustr[0];
 	    len = 0;
+	}
 	c1 = c1 * 5 + 0x7b7d159cU;
 	c2 = c2 * 5 + 0x6bce6396U;
 	k *= c1;
 	k = (k << 11) ^ (k >> 21);
 	k *= c2;
 	h = (h << 13) ^ (h >> 19);
 	h = h * 5 + 0x52dce729U;
 	h ^= k;
+    }
     h ^= (uint32_t)len2;
     h *= 0x85ebca6b;
     h ^= h >> 13;
     h *= 0xc2b2ae35;
     h ^= h >> 16;
     buf = bmake_malloc(9);
     for (i = 0; i < 8; i++) {
 	buf[i] = hexdigits[h & 0x0f];
 	h >>= 4;
+    }
     buf[8] = '\0';
     return buf;
+}
 static char *
 VarStrftime(const char *fmt, Boolean zulu, time_t tim)
+{
     char buf[BUFSIZ];
     if (!tim)
 	time(&tim);
     if (!*fmt)
 	fmt = "%c";
     strftime(buf, sizeof(buf), fmt, zulu ? gmtime(&tim) : localtime(&tim));
     buf[sizeof(buf) - 1] = '\0';
     return bmake_strdup(buf);
+}
 /* The ApplyModifier functions all work in the same way.  They get the
  * current parsing position (pp) and parse the modifier from there.  The
  * modifier typically lasts until the next ':', or a closing '}' or ')'
  * (taken from st->endc), or the end of the string (parse error).
+ *
  * The high-level behavior of these functions is:
+ *
  * 1. parse the modifier
  * 2. evaluate the modifier
  * 3. housekeeping
+ *
  * Parsing the modifier
+ *
  * If parsing succeeds, the parsing position *pp is updated to point to the
  * first character following the modifier, which typically is either ':' or
  * st->endc.
+ *
  * If parsing fails because of a missing delimiter (as in the :S, :C or :@
  * modifiers), return AMR_CLEANUP.
+ *
  * If parsing fails because the modifier is unknown, return AMR_UNKNOWN to
  * try the SysV modifier ${VAR:from=to} as fallback.  This should only be
  * done as long as there have been no side effects from evaluating nested
  * variables, to avoid evaluating them more than once.  In this case, the
  * parsing position must not be updated.  (XXX: Why not? The original parsing
  * position is well-known in ApplyModifiers.)
+ *
  * If parsing fails and the SysV modifier ${VAR:from=to} should not be used
  * as a fallback, either issue an error message using Error or Parse_Error
  * and then return AMR_CLEANUP, or return AMR_BAD for the default error
  * message.  Both of these return values will stop processing the variable
  * expression.  (XXX: As of 2020-08-23, evaluation of the whole string
  * continues nevertheless after skipping a few bytes, which essentially is
  * undefined behavior.  Not in the sense of C, but still it's impossible to
  * predict what happens in the parser.)
+ *
  * Evaluating the modifier
+ *
  * After parsing, the modifier is evaluated.  The side effects from evaluating
  * nested variable expressions in the modifier text often already happen
  * during parsing though.
+ *
  * Evaluating the modifier usually takes the current value of the variable
  * expression from st->val, or the variable name from st->v->name and stores
  * the result in st->newVal.
+ *
  * If evaluating fails (as of 2020-08-23), an error message is printed using
  * Error.  This function has no side-effects, it really just prints the error
  * message.  Processing the expression continues as if everything were ok.
  * XXX: This should be fixed by adding proper error handling to Var_Subst,
  * Var_Parse, ApplyModifiers and ModifyWords.
+ *
  * Housekeeping
+ *
  * Some modifiers such as :D and :U turn undefined expressions into defined
  * expressions (see VEF_UNDEF, VEF_DEF).
+ *
  * Some modifiers need to free some memory.
  */
 typedef enum VarExprFlags {
     /* The variable expression is based on an undefined variable. */
     VEF_UNDEF = 0x01,
     /* The variable expression started as an undefined expression, but one
      * of the modifiers (such as :D or :U) has turned the expression from
      * undefined to defined. */
     VEF_DEF = 0x02
 } VarExprFlags;
 ENUM_FLAGS_RTTI_2(VarExprFlags,
 		  VEF_UNDEF, VEF_DEF);
 typedef struct ApplyModifiersState {
     const char startc;		/* '\0' or '{' or '(' */
     const char endc;		/* '\0' or '}' or ')' */
     Var * const v;
     GNode * const ctxt;
     const VarEvalFlags eflags;
     char *val;			/* The old value of the expression,
 				 * before applying the modifier, never NULL */
     char *newVal;		/* The new value of the expression,
 				 * after applying the modifier, never NULL */
     char sep;			/* Word separator in expansions
 				 * (see the :ts modifier) */
     Boolean oneBigWord;		/* TRUE if some modifiers that otherwise split
 				 * the variable value into words, like :S and
 				 * :C, treat the variable value as a single big
 				 * word, possibly containing spaces. */
     VarExprFlags exprFlags;
 } ApplyModifiersState;
 static void
 ApplyModifiersState_Define(ApplyModifiersState *st)
+{
     if (st->exprFlags & VEF_UNDEF)
 	st->exprFlags |= VEF_DEF;
+}
 typedef enum ApplyModifierResult {
     AMR_OK,			/* Continue parsing */
     AMR_UNKNOWN,		/* Not a match, try other modifiers as well */
     AMR_BAD,			/* Error out with "Bad modifier" message */
     AMR_CLEANUP			/* Error out without error message */
 } ApplyModifierResult;
 /*-
  * Parse a part of a modifier such as the "from" and "to" in :S/from/to/
  * or the "var" or "replacement" in :@var@replacement+${var}@, up to and
  * including the next unescaped delimiter.  The delimiter, as well as the
  * backslash or the dollar, can be escaped with a backslash.
+ *
  * Return the parsed (and possibly expanded) string, or NULL if no delimiter
  * was found.  On successful return, the parsing position pp points right
  * after the delimiter.  The delimiter is not included in the returned