 @@ -1,2345 +1,2345 @@
-/*	$NetBSD: var.c,v 1.309 2020/07/26 10:11:04 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.310 2020/07/26 12:19:37 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.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.309 2020/07/26 10:11:04 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.310 2020/07/26 12:19:37 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.309 2020/07/26 10:11:04 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.310 2020/07/26 12:19:37 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * var.c --
  *	Variable-handling functions
+ *
  * Interface:
  *	Var_Set		    Set the value of a variable in the given
  *			    context. The variable is created if it doesn't
  *			    yet exist.
+ *
  *	Var_Append	    Append more characters to an existing variable
  *			    in the given context. The variable needn't
  *			    exist already -- it will be created if it doesn't.
  *			    A space is placed between the old value and the
  *			    new one.
+ *
  *	Var_Exists	    See if a variable exists.
+ *
  *	Var_Value 	    Return the value of a variable in a context or
  *			    NULL if the variable is undefined.
+ *
  *	Var_Subst 	    Substitute either a single variable or all
  *			    variables in a string, using the given context.
+ *
  *	Var_Parse 	    Parse a variable expansion from a string and
  *			    return the result and the number of characters
  *			    consumed.
+ *
  *	Var_Delete	    Delete a variable in a context.
+ *
  *	Var_Init  	    Initialize this module.
+ *
  * Debugging:
  *	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    <ctype.h>
 #include    <inttypes.h>
 #include    <limits.h>
 #include    <stdlib.h>
 #include    <time.h>
 #include    "make.h"
 #include    "buf.h"
 #include    "dir.h"
 #include    "job.h"
 #include    "metachar.h"
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
 char **savedEnv = NULL;
 /*
  * This is a harmless return value for Var_Parse that can be used by Var_Subst
  * to determine if there was an error in parsing -- easier than returning
  * a flag, as things outside this module don't give a hoot.
  */
 char var_Error[] = "";
 /*
  * Similar to var_Error, but returned when the 'VARE_UNDEFERR' flag for
  * Var_Parse is not set. Why not just use a constant? Well, GCC likes
  * to condense identical string instances...
  */
 static char varNoError[] = "";
 /*
  * Traditionally we consume $$ during := like any other expansion.
  * Other make's do not.
  * This knob allows controlling the behavior.
  * FALSE to consume $$ during := assignment.
  * TRUE to preserve $$ during := assignment.
  */
 #define 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 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 {
     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 {
     VAR_IN_USE		= 0x01,	/* Variable's value is currently being used
 				 * by Var_Parse or Var_Subst.
 				 * Used to avoid endless recursion */
     VAR_FROM_ENV	= 0x02,	/* Variable comes from the environment */
     VAR_JUNK		= 0x04,	/* Variable is a junk variable that
 				 * should be destroyed when done with
 				 * it. Used by Var_Parse for undefined,
 				 * modified variables */
     VAR_KEEP		= 0x08,	/* Variable is VAR_JUNK, but we found
 				 * a use for it in some modifier and
 				 * the value is therefore valid */
     VAR_EXPORTED	= 0x10,	/* Variable is exported */
     VAR_REEXPORT	= 0x20,	/* Indicate if var needs re-export.
 				 * This would be true if it contains $'s */
     VAR_FROM_CMD	= 0x40	/* Variable came from command line */
 } Var_Flags;
 typedef struct Var {
     char          *name;	/* the variable's name */
     Buffer	  val;		/* its value */
     Var_Flags	  flags;    	/* miscellaneous status flags */
 }  Var;
 /*
  * Exporting vars is expensive so skip it if we can
  */
 typedef enum {
     VAR_EXPORTED_NONE,
     VAR_EXPORTED_YES,
     VAR_EXPORTED_ALL
 } VarExportedMode;
 static VarExportedMode var_exportedVars = VAR_EXPORTED_NONE;
 typedef enum {
     /*
      * 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 {
     VARP_SUB_GLOBAL	= 0x01,	/* Apply substitution globally */
     VARP_SUB_ONE	= 0x02,	/* Apply substitution to one word */
     VARP_SUB_MATCHED	= 0x04,	/* There was a match */
     VARP_ANCHOR_START	= 0x08,	/* Match at start of word */
     VARP_ANCHOR_END	= 0x10	/* Match at end of word */
 } VarPatternFlags;
 typedef enum {
     VAR_NO_EXPORT	= 0x01	/* do not export */
 } VarSet_Flags;
 #define BROPEN	'{'
 #define BRCLOSE	'}'
 #define PROPEN	'('
 #define PRCLOSE	')'
 /*-
  *-----------------------------------------------------------------------
  * 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.
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 static Var *
 VarFind(const char *name, GNode *ctxt, VarFindFlags flags)
+{
     Hash_Entry         	*var;
     Var			*v;
     /*
      * 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.
      */
     if (*name == '.' && isupper((unsigned char) 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 'T':
 	    if (strcmp(name, ".TARGET") == 0)
 		name = TARGET;
 	    break;
+	}
+    }
 #ifdef notyet
     /* for compatibility with gmake */
     if (name[0] == '^' && name[1] == '\0')
 	name = ALLSRC;
 #endif
     /*
      * 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 = Hash_FindEntry(&ctxt->context, name);
     if (var == NULL && (flags & FIND_CMD) && ctxt != VAR_CMD) {
 	var = Hash_FindEntry(&VAR_CMD->context, name);
+    }
     if (!checkEnvFirst && var == NULL && (flags & FIND_GLOBAL) &&
 	ctxt != VAR_GLOBAL)
+    {
 	var = Hash_FindEntry(&VAR_GLOBAL->context, name);
 	if (var == NULL && ctxt != VAR_INTERNAL) {
 	    /* VAR_INTERNAL is subordinate to VAR_GLOBAL */
 	    var = Hash_FindEntry(&VAR_INTERNAL->context, name);
+	}
+    }
     if (var == NULL && (flags & FIND_ENV)) {
 	char *env;
 	if ((env = getenv(name)) != NULL) {
 	    int len;
 	    v = bmake_malloc(sizeof(Var));
 	    v->name = bmake_strdup(name);
 	    len = strlen(env);
 	    Buf_Init(&v->val, len + 1);
 	    Buf_AddBytes(&v->val, len, env);
 	    v->flags = VAR_FROM_ENV;
 	    return v;
 	} else if (checkEnvFirst && (flags & FIND_GLOBAL) &&
 		   ctxt != VAR_GLOBAL)
+	{
 	    var = Hash_FindEntry(&VAR_GLOBAL->context, name);
 	    if (var == NULL && ctxt != VAR_INTERNAL) {
 		var = Hash_FindEntry(&VAR_INTERNAL->context, name);
+	    }
 	    if (var == NULL) {
 		return NULL;
 	    } else {
 		return (Var *)Hash_GetValue(var);
+	    }
 	} else {
 	    return NULL;
+	}
     } else if (var == NULL) {
 	return NULL;
     } else {
 	return (Var *)Hash_GetValue(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:
  *	1 if it is an environment variable 0 ow.
+ *
  * Side Effects:
  *	The variable is free'ed if it is an environent variable.
  *-----------------------------------------------------------------------
  */
 static Boolean
 VarFreeEnv(Var *v, Boolean destroy)
+{
     if (!(v->flags & VAR_FROM_ENV))
 	return FALSE;
     free(v->name);
     Buf_Destroy(&v->val, destroy);
     free(v);
     return TRUE;
+}
 /*-
  *-----------------------------------------------------------------------
  * VarAdd  --
  *	Add a new variable of name name and value val to the given context
+ *
  * Input:
  *	name		name of variable to add
  *	val		value to set it to
  *	ctxt		context in which to set it
+ *
  * Side Effects:
  *	The new variable is placed at the front of 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)
+{
     Var   	  *v;
     int		  len;
     Hash_Entry    *h;
     v = bmake_malloc(sizeof(Var));
     len = val != NULL ? strlen(val) : 0;
     Buf_Init(&v->val, len + 1);
     Buf_AddBytes(&v->val, len, val);
     v->flags = 0;
     h = Hash_CreateEntry(&ctxt->context, name, NULL);
     Hash_SetValue(h, v);
     v->name = h->name;
     if (DEBUG(VAR) && !(ctxt->flags & INTERNAL)) {
 	fprintf(debug_file, "%s:%s = %s\n", ctxt->name, name, val);
+    }
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Delete --
  *	Remove a variable from a context.
+ *
  * Side Effects:
  *	The Var structure is removed and freed.
+ *
  *-----------------------------------------------------------------------
  */
 void
 Var_Delete(const char *name, GNode *ctxt)
+{
     Hash_Entry 	  *ln;
     char *cp;
     if (strchr(name, '$') != NULL) {
 	cp = Var_Subst(NULL, name, VAR_GLOBAL, VARE_WANTRES);
     } else {
 	cp = UNCONST(name);
+    }
     ln = Hash_FindEntry(&ctxt->context, cp);
     if (DEBUG(VAR)) {
 	fprintf(debug_file, "%s:delete %s%s\n",
 	    ctxt->name, cp, ln ? "" : " (not found)");
+    }
     if (cp != name)
 	free(cp);
     if (ln != NULL) {
 	Var *v = (Var *)Hash_GetValue(ln);
 	if (v->flags & VAR_EXPORTED)
 	    unsetenv(v->name);
 	if (strcmp(MAKE_EXPORTED, v->name) == 0)
 	    var_exportedVars = VAR_EXPORTED_NONE;
 	if (v->name != ln->name)
 	    free(v->name);
 	Hash_DeleteEntry(&ctxt->context, ln);
 	Buf_Destroy(&v->val, TRUE);
 	free(v);
+    }
+}
 /*
  * Export a var.
  * 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 int
 Var_Export1(const char *name, VarExportFlags flags)
+{
     char tmp[BUFSIZ];
     Var *v;
     char *val = NULL;
     int n;
     VarExportFlags parent = flags & VAR_EXPORT_PARENT;
     if (*name == '.')
 	return 0;		/* skip internals */
     if (!name[1]) {
 	/*
 	 * 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 0;
+	}
+    }
     v = VarFind(name, VAR_GLOBAL, 0);
     if (v == NULL)
 	return 0;
     if (!parent &&
 	(v->flags & (VAR_EXPORTED | VAR_REEXPORT)) == VAR_EXPORTED) {
 	return 0;			/* nothing to do */
+    }
     val = Buf_GetAll(&v->val, NULL);
     if ((flags & VAR_EXPORT_LITERAL) == 0 && strchr(val, '$')) {
 	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 1;
+	}
 	if (v->flags & VAR_IN_USE) {
 	    /*
 	     * We recursed while exporting in a child.
 	     * This isn't going to end well, just skip it.
 	     */
 	    return 0;
+	}
 	n = snprintf(tmp, sizeof(tmp), "${%s}", name);
 	if (n < (int)sizeof(tmp)) {
 	    val = Var_Subst(NULL, tmp, VAR_GLOBAL, VARE_WANTRES);
 	    setenv(name, val, 1);
 	    free(val);
+	}
     } else {
 	if (parent)
 	    v->flags &= ~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 1;
+}
 static void
 Var_ExportVars_callback(void *entry, void *unused MAKE_ATTR_UNUSED)
+{
     Var *var = entry;
     Var_Export1(var->name, 0);
+}
 /*
  * This gets called from our children.
  */
 void
 Var_ExportVars(void)
+{
     char tmp[BUFSIZ];
     char *val;
     int n;
     /*
      * 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.
      */
     snprintf(tmp, sizeof(tmp), "%d", makelevel + 1);
     setenv(MAKE_LEVEL_ENV, tmp, 1);
     if (VAR_EXPORTED_NONE == var_exportedVars)
 	return;
     if (VAR_EXPORTED_ALL == var_exportedVars) {
 	/* Ouch! This is crazy... */
 	Hash_ForEach(&VAR_GLOBAL->context, Var_ExportVars_callback, NULL);
 	return;
+    }
     /*
      * We have a number of exported vars,
      */
     n = snprintf(tmp, sizeof(tmp), "${" MAKE_EXPORTED ":O:u}");
     if (n < (int)sizeof(tmp)) {
 	char **av;
 	char *as;
 	int ac;
 	int i;
 	val = Var_Subst(NULL, tmp, VAR_GLOBAL, VARE_WANTRES);
 	if (*val) {
 	    av = brk_string(val, &ac, FALSE, &as);
 	    for (i = 0; i < ac; i++)
 		Var_Export1(av[i], 0);
 	    free(as);
 	    free(av);
+	}
 	free(val);
+    }
+}
 /*
  * This is called when .export is seen or
  * .MAKE.EXPORTED is modified.
  * It is also called when any exported var is modified.
  */
 void
 Var_Export(char *str, int isExport)
+{
     char **av;
     char *as;
     VarExportFlags flags;
     int ac;
     int i;
     if (isExport && (!str || !str[0])) {
 	var_exportedVars = VAR_EXPORTED_ALL; /* use with caution! */
 	return;
+    }
     flags = 0;
     if (strncmp(str, "-env", 4) == 0) {
 	str += 4;
     } else if (strncmp(str, "-literal", 8) == 0) {
 	str += 8;
 	flags |= VAR_EXPORT_LITERAL;
     } else {
 	flags |= VAR_EXPORT_PARENT;
+    }
     char *val = Var_Subst(NULL, str, VAR_GLOBAL, VARE_WANTRES);
     if (*val) {
 	av = brk_string(val, &ac, FALSE, &as);
 	for (i = 0; i < ac; i++) {
 	    const char *name = av[i];
 	    if (!name[1]) {
 		/*
 		 * 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 '!':
 		    continue;
+		}
+	    }
 	    if (Var_Export1(name, flags)) {
 		if (VAR_EXPORTED_ALL != var_exportedVars)
 		    var_exportedVars = VAR_EXPORTED_YES;
 		if (isExport && (flags & VAR_EXPORT_PARENT)) {
 		    Var_Append(MAKE_EXPORTED, name, VAR_GLOBAL);
+		}
+	    }
+	}
 	free(as);
 	free(av);
+    }
     free(val);
+}
 extern char **environ;
 /*
  * This is called when .unexport[-env] is seen.
  */
 void
 Var_UnExport(char *str)
+{
     char tmp[BUFSIZ];
     char *vlist;
     char *cp;
     Boolean unexport_env;
     int n;
     if (str == NULL || str[0] == '\0')
 	return;			/* assert? */
     vlist = NULL;
     str += 8;
     unexport_env = (strncmp(str, "-env", 4) == 0);
     if (unexport_env) {
 	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 *));
+	}
 	if (!newenv)
 	    return;
 	/* 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 {
 	for (; *str != '\n' && isspace((unsigned char) *str); str++)
 	    continue;
 	if (str[0] && str[0] != '\n') {
 	    vlist = str;
+	}
+    }
     if (!vlist) {
 	/* Using .MAKE.EXPORTED */
 	vlist = Var_Subst(NULL, "${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL,
 			  VARE_WANTRES);
+    }
     if (vlist) {
 	Var *v;
 	char **av;
 	char *as;
 	int ac;
 	int i;
 	av = brk_string(vlist, &ac, FALSE, &as);
 	for (i = 0; i < ac; i++) {
 	    v = VarFind(av[i], VAR_GLOBAL, 0);
 	    if (!v)
 		continue;
 	    if (!unexport_env &&
 		(v->flags & (VAR_EXPORTED | VAR_REEXPORT)) == VAR_EXPORTED)
 		unsetenv(v->name);
 	    v->flags &= ~(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 (vlist == str) {
 		n = snprintf(tmp, sizeof(tmp),
 			     "${" MAKE_EXPORTED ":N%s}", v->name);
 		if (n < (int)sizeof(tmp)) {
 		    cp = Var_Subst(NULL, tmp, VAR_GLOBAL, VARE_WANTRES);
 		    Var_Set(MAKE_EXPORTED, cp, VAR_GLOBAL);
 		    free(cp);
+		}
+	    }
+	}
 	free(as);
 	free(av);
 	if (vlist != str) {
 	    Var_Delete(MAKE_EXPORTED, VAR_GLOBAL);
 	    free(vlist);
+	}
+    }
+}
 static void
 Var_Set_with_flags(const char *name, const char *val, GNode *ctxt,
 		   VarSet_Flags flags)
+{
     Var *v;
     char *expanded_name = NULL;
     /*
      * 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...
      */
     if (strchr(name, '$') != NULL) {
 	expanded_name = Var_Subst(NULL, name, ctxt, VARE_WANTRES);
 	if (expanded_name[0] == '\0') {
 	    if (DEBUG(VAR)) {
 		fprintf(debug_file, "Var_Set(\"%s\", \"%s\", ...) "
 			"name expands to empty string - ignored\n",
 			name, val);
+	    }
 	    free(expanded_name);
 	    return;
+	}
 	name = expanded_name;
+    }
     if (ctxt == VAR_GLOBAL) {
 	v = VarFind(name, VAR_CMD, 0);
 	if (v != NULL) {
 	    if ((v->flags & VAR_FROM_CMD)) {
 		if (DEBUG(VAR)) {
 		    fprintf(debug_file, "%s:%s = %s ignored!\n", ctxt->name, name, val);
+		}
 		goto out;
+	    }
 	    VarFreeEnv(v, TRUE);
+	}
+    }
     v = VarFind(name, ctxt, 0);
     if (v == NULL) {
 	if (ctxt == VAR_CMD && (flags & VAR_NO_EXPORT) == 0) {
 	    /*
 	     * 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);
     } else {
 	Buf_Empty(&v->val);
 	if (val)
 	    Buf_AddBytes(&v->val, strlen(val), val);
 	if (DEBUG(VAR)) {
 	    fprintf(debug_file, "%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)
      */
     if (ctxt == VAR_CMD && (flags & VAR_NO_EXPORT) == 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 (varNoExportEnv != TRUE)
 	    setenv(name, val ? val : "", 1);
 	Var_Append(MAKEOVERRIDES, name, VAR_GLOBAL);
+    }
     if (name[0] == '.' && strcmp(name, SAVE_DOLLARS) == 0)
 	save_dollars = s2Boolean(val, save_dollars);
 out:
     free(expanded_name);
     if (v != NULL)
 	VarFreeEnv(v, TRUE);
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Set --
  *	Set the variable name to the value val in the given context.
+ *
  * Input:
  *	name		name of variable to set
  *	val		value to give to the variable
  *	ctxt		context in which to set it
+ *
  * Side Effects:
  *	If the variable doesn't yet exist, a new record is created for it.
  *	Else the old value is freed and the new one stuck in its place
+ *
  * 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.
+ *
  * Input:
  *	name		name of variable to modify
  *	val		String to append to it
  *	ctxt		Context in which this should occur
+ *
  * Side Effects:
  *	If the variable doesn't exist, it is created. Else the strings
  *	are concatenated (with a space in between).
+ *
  * 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)
+{
     Var *v;
     Hash_Entry *h;
     char *expanded_name = NULL;
     if (strchr(name, '$') != NULL) {
 	expanded_name = Var_Subst(NULL, name, ctxt, VARE_WANTRES);
 	if (expanded_name[0] == '\0') {
 	    if (DEBUG(VAR)) {
 		fprintf(debug_file, "Var_Append(\"%s\", \"%s\", ...) "
 			"name expands to empty string - ignored\n",
 			name, val);
+	    }
 	    free(expanded_name);
 	    return;
+	}
 	name = expanded_name;
+    }
     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_AddBytes(&v->val, strlen(val), val);
 	if (DEBUG(VAR)) {
 	    fprintf(debug_file, "%s:%s = %s\n", ctxt->name, name,
 		    Buf_GetAll(&v->val, NULL));
+	}
 	if (v->flags & VAR_FROM_ENV) {
 	    /*
 	     * 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 &= ~VAR_FROM_ENV;
 	    h = Hash_CreateEntry(&ctxt->context, name, NULL);
 	    Hash_SetValue(h, v);
+	}
+    }
     free(expanded_name);
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Exists --
  *	See if the given variable exists.
+ *
  * Input:
  *	name		Variable to find
  *	ctxt		Context in which to start search
+ *
  * Results:
  *	TRUE if it does, FALSE if it doesn't
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 Boolean
 Var_Exists(const char *name, GNode *ctxt)
+{
     Var		  *v;
     char          *cp;
     if ((cp = strchr(name, '$')) != NULL)
 	cp = Var_Subst(NULL, name, ctxt, VARE_WANTRES);
     v = VarFind(cp ? cp : name, ctxt, FIND_CMD | FIND_GLOBAL | FIND_ENV);
     free(cp);
     if (v == NULL)
 	return FALSE;
     (void)VarFreeEnv(v, TRUE);
     return TRUE;
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Value --
  *	Return the value of the named variable in the given context
+ *
  * 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
+ *
  * Side Effects:
  *	None
  *-----------------------------------------------------------------------
  */
 char *
 Var_Value(const char *name, GNode *ctxt, char **frp)
+{
     Var *v = VarFind(name, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
     *frp = NULL;
     if (v == NULL)
 	return NULL;
     char *p = Buf_GetAll(&v->val, NULL);
     if (VarFreeEnv(v, FALSE))
 	*frp = p;
     return p;
+}
 /* SepBuf is a string being built from "words", interleaved with separators. */
 typedef struct {
     Buffer buf;
     Boolean needSep;
     char sep;
 } 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 void *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_size, mem);
+}
 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_AddBytes(buf, word, slash - word);
     else
 	SepBuf_AddBytes(buf, ".", 1);
+}
 /* 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_AddBytes(buf, base, strlen(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_AddBytes(buf, dot + 1, strlen(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)
+{
     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;
     if (DEBUG(VAR))
 	fprintf(debug_file, "VarMatch [%s] [%s]\n", word, pattern);
     if (Str_Match(word, pattern))
 	SepBuf_AddBytes(buf, word, strlen(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_AddBytes(buf, word, strlen(word));
+}
 #ifdef SYSVVARSUB
 /*-
  *-----------------------------------------------------------------------
  * Str_SYSVMatch --
  *	Check word against pattern for a match (% is wild),
+ *
  * Input:
  *	word		Word to examine
  *	pattern		Pattern to examine against
  *	len		Number of characters to substitute
+ *
  * Results:
  *	Returns the beginning position of a match or null. The number
  *	of characters matched is returned in len.
  *-----------------------------------------------------------------------
  */
 static const char *
 Str_SYSVMatch(const char *word, const char *pattern, size_t *len,
     Boolean *hasPercent)
+{
     const char *p = pattern;
     const char *w = word;
     const char *m;
     *hasPercent = FALSE;
     if (*p == '\0') {
 	/* Null pattern is the whole string */
 	*len = strlen(w);
 	return w;
+    }
     if ((m = strchr(p, '%')) != NULL) {
 	*hasPercent = TRUE;
 	if (*w == '\0') {
 		/* empty word does not match pattern */
 		return NULL;
+	}
 	/* check that the prefix matches */
 	for (; p != m && *w && *w == *p; w++, p++)
 	     continue;
 	if (p != m)
 	    return NULL;	/* No match */
 	if (*++p == '\0') {
 	    /* No more pattern, return the rest of the string */
 	    *len = strlen(w);
 	    return w;
+	}
+    }
     m = w;
     /* Find a matching tail */
     do {
 	if (strcmp(p, w) == 0) {
 	    *len = w - m;
 	    return m;
+	}
     } while (*w++ != '\0');
     return NULL;
+}
 /*-
  *-----------------------------------------------------------------------
  * Str_SYSVSubst --
  *	Substitute '%' on the pattern with len characters from src.
  *	If the pattern does not contain a '%' prepend len characters
  *	from src.
+ *
  * Side Effects:
  *	Places result on buf
  *-----------------------------------------------------------------------
  */
 static void
 Str_SYSVSubst(SepBuf *buf, const char *pat, const char *src, size_t len,
 	      Boolean lhsHasPercent)
+{
     const char *m;
     if ((m = strchr(pat, '%')) != NULL && lhsHasPercent) {
 	/* Copy the prefix */
 	SepBuf_AddBytes(buf, pat, m - pat);
 	/* skip the % */
 	pat = m + 1;
+    }
     if (m != NULL || !lhsHasPercent) {
 	/* Copy the pattern */
 	SepBuf_AddBytes(buf, src, len);
+    }
     /* append the rest */
     SepBuf_AddBytes(buf, pat, strlen(pat));
+}
 typedef struct {
     GNode *ctx;
     const char *lhs;
     const char *rhs;
 } ModifyWord_SYSVSubstArgs;
 /* Callback for ModifyWords to implement the :%.from=%.to modifier. */
 static void
 ModifyWord_SYSVSubst(const char *word, SepBuf *buf, void *data)
+{
     const ModifyWord_SYSVSubstArgs *args = data;
     size_t len;
     Boolean hasPercent;
     const char *ptr = Str_SYSVMatch(word, args->lhs, &len, &hasPercent);
     if (ptr != NULL) {
 	char *varexp = Var_Subst(NULL, args->rhs, args->ctx, VARE_WANTRES);
 	Str_SYSVSubst(buf, varexp, ptr, len, hasPercent);
 	free(varexp);
     } else {
 	SepBuf_AddBytes(buf, word, strlen(word));
+    }
+}
 #endif
 typedef struct {
     const char	*lhs;
     size_t	lhsLen;
     const char	*rhs;
     size_t	rhsLen;
     VarPatternFlags pflags;
 } ModifyWord_SubstArgs;
 /* 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);
     ModifyWord_SubstArgs *args = data;
     const VarPatternFlags pflags = args->pflags;
     if ((pflags & (VARP_SUB_ONE | VARP_SUB_MATCHED)) ==
 	(VARP_SUB_ONE | VARP_SUB_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;
 	    SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
 	    args->pflags |= VARP_SUB_MATCHED;
 	} else {
 	    SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
 	    SepBuf_AddBytes(buf, word + args->lhsLen, wordLen - args->lhsLen);
 	    args->pflags |= VARP_SUB_MATCHED;
+	}
 	return;
+    }
     if (args->pflags & VARP_ANCHOR_END) {
 	if (wordLen < args->lhsLen)
 	    goto nosub;
 	const char *start = word + (wordLen - args->lhsLen);
 	if (memcmp(start, args->lhs, args->lhsLen) != 0)
 	    goto nosub;
 	SepBuf_AddBytes(buf, word, start - word);
 	SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
 	args->pflags |= VARP_SUB_MATCHED;
 	return;
+    }
     /* unanchored */
     const char *cp;
     while ((cp = Str_FindSubstring(word, args->lhs)) != NULL) {
 	SepBuf_AddBytes(buf, word, cp - word);
 	SepBuf_AddBytes(buf, args->rhs, args->rhsLen);
 	args->pflags |= VARP_SUB_MATCHED;
 	wordLen -= (cp - word) + args->lhsLen;
 	word = cp + args->lhsLen;
 	if (wordLen == 0 || !(args->pflags & VARP_SUB_GLOBAL))
 	    break;
 	args->pflags |= VARP_SUB_MATCHED;
+    }
 nosub:
     SepBuf_AddBytes(buf, word, wordLen);
+}
 #ifndef NO_REGEX
 /*-
  *-----------------------------------------------------------------------
  * VarREError --
  *	Print the error caused by a regcomp or regexec call.
+ *
  * Side Effects:
  *	An error gets printed.
+ *
  *-----------------------------------------------------------------------
  */
 static void
 VarREError(int reerr, regex_t *pat, const char *str)
+{
     char *errbuf;
     int errlen;
     errlen = regerror(reerr, pat, 0, 0);
     errbuf = bmake_malloc(errlen);
     regerror(reerr, pat, errbuf, errlen);
     Error("%s: %s", str, errbuf);
     free(errbuf);
+}
 typedef struct {
     regex_t	   re;
     int		   nsub;
     char 	  *replace;
     VarPatternFlags pflags;
 } ModifyWord_SubstRegexArgs;
 /* 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)
+{
     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->pflags & VARP_SUB_MATCHED))
 	goto nosub;
 tryagain:
     xrv = regexec(&args->re, wp, args->nsub, m, flags);
     switch (xrv) {
     case 0:
 	args->pflags |= VARP_SUB_MATCHED;
 	SepBuf_AddBytes(buf, wp, m[0].rm_so);
 	for (rp = args->replace; *rp; rp++) {
 	    if (*rp == '\\' && (rp[1] == '&' || rp[1] == '\\')) {
 		SepBuf_AddBytes(buf, rp + 1, 1);
 		rp++;
 	    } else if (*rp == '&' ||
 		(*rp == '\\' && isdigit((unsigned char)rp[1]))) {
 		int n;
 		char errstr[3];
 		if (*rp == '&') {
 		    n = 0;
 		    errstr[0] = '&';
 		    errstr[1] = '\0';
 		} else {
 		    n = rp[1] - '0';
 		    errstr[0] = '\\';
 		    errstr[1] = rp[1];
 		    errstr[2] = '\0';
 		    rp++;
+		}
 		if (n >= args->nsub) {
 		    Error("No subexpression %s", errstr);
 		} else if (m[n].rm_so == -1 && m[n].rm_eo == -1) {
 		    Error("No match for subexpression %s", errstr);
 		} else {
 		    SepBuf_AddBytes(buf, wp + m[n].rm_so,
 				    m[n].rm_eo - m[n].rm_so);
+		}
 	    } else {
 		SepBuf_AddBytes(buf, rp, 1);
+	    }
+	}
 	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_AddBytes(buf, wp, strlen(wp));
+	}
 	break;
     default:
 	VarREError(xrv, &args->re, "Unexpected regex error");
 	/* fall through */
     case REG_NOMATCH:
     nosub:
 	SepBuf_AddBytes(buf, wp, strlen(wp));
 	break;
+    }
+}
 #endif
 typedef struct {
     GNode	*ctx;
     char	*tvar;		/* name of temporary variable */
     char	*str;		/* string to expand */
     VarEvalFlags eflags;
 } ModifyWord_LoopArgs;
 /* Callback for ModifyWords to implement the :@var@...@ modifier of ODE make. */
 static void
 ModifyWord_Loop(const char *word, SepBuf *buf, void *data)
+{
     if (word[0] == '\0')
 	return;
     const ModifyWord_LoopArgs *args = data;
     Var_Set_with_flags(args->tvar, word, args->ctx, VAR_NO_EXPORT);
     char *s = Var_Subst(NULL, args->str, args->ctx, args->eflags);
     if (DEBUG(VAR)) {
 	fprintf(debug_file,
 		"ModifyWord_Loop: in \"%s\", replace \"%s\" with \"%s\" "
 		"to \"%s\"\n",
 		word, args->tvar, args->str, s ? s : "(null)");
+    }
     if (s != NULL && s[0] != '\0') {
 	if (s[0] == '\n' || (buf->buf.count > 0 &&
 	    buf->buf.buffer[buf->buf.count - 1] == '\n'))
 	    buf->needSep = FALSE;
 	SepBuf_AddBytes(buf, s, strlen(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(Byte sep, Boolean oneBigWord, const char *str, int first,
 	       int last)
+{
     SepBuf buf;
     char **av;			/* word list */
     char *as;			/* word list memory */
     int ac, i;
     int start, end, step;
     SepBuf_Init(&buf, sep);
     if (oneBigWord) {
 	/* fake what brk_string() would do if there were only one word */
 	ac = 1;
 	av = bmake_malloc((ac + 1) * sizeof(char *));
 	as = bmake_strdup(str);
 	av[0] = as;
 	av[1] = NULL;
     } else {
 	av = brk_string(str, &ac, FALSE, &as);
+    }
     /*
      * Now sanitize seldata.
      * If seldata->start or seldata->end are negative, convert them to
      * the positive equivalents (-1 gets converted to argc, -2 gets
      * converted to (argc-1), etc.).
      */
     if (first < 0)
 	first += ac + 1;
     if (last < 0)
 	last += ac + 1;
     /*
      * We avoid scanning more of the list than we need to.
      */
     if (first > last) {
 	start = MIN(ac, first) - 1;
 	end = MAX(0, last - 1);
 	step = -1;
     } else {
 	start = MAX(0, first - 1);
 	end = MIN(ac, last);
 	step = 1;
+    }
     for (i = start; (step < 0) == (i >= end); i += step) {
 	SepBuf_AddBytes(&buf, av[i], strlen(av[i]));
 	SepBuf_Sep(&buf);
+    }
     free(as);
     free(av);
     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];
     char *rp = cached_realpath(word, rbuf);
     if (rp != NULL && *rp == '/' && stat(rp, &st) == 0)
 	word = rp;
     SepBuf_AddBytes(buf, word, strlen(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
  *	data		Custom data for modifyWord
+ *
  * Results:
  *	A string of all the words modified appropriately.
  *-----------------------------------------------------------------------
  */
 static char *
 ModifyWords(GNode *ctx, Byte sep, Boolean oneBigWord,
 	    const char *str, ModifyWordsCallback modifyWord, void *data)
+{
     SepBuf result;
     char **av;			/* word list */
     char *as;			/* word list memory */
     int ac, i;
     SepBuf_Init(&result, sep);
     if (oneBigWord) {
 	/* fake what brk_string() would do if there were only one word */
 	ac = 1;
 	av = bmake_malloc((ac + 1) * sizeof(char *));
 	as = bmake_strdup(str);
 	av[0] = as;
 	av[1] = NULL;
     } else {
 	av = brk_string(str, &ac, FALSE, &as);
+    }
     if (DEBUG(VAR)) {
 	fprintf(debug_file, "ModifyWords: split \"%s\" into %d words\n",
 		str, ac);
+    }
     for (i = 0; i < ac; i++) {
 	size_t orig_count = result.buf.count;
 	modifyWord(av[i], &result, data);
 	size_t count = result.buf.count;
 	if (count != orig_count)
 	    SepBuf_Sep(&result);
+    }
     free(as);
     free(av);
     return SepBuf_Destroy(&result, FALSE);
+}
 static int
 VarWordCompare(const void *a, const void *b)
+{
     int r = strcmp(*(const char * const *)a, *(const char * const *)b);
     return r;
+}
 static int
 VarWordCompareReverse(const void *a, const void *b)
+{
     int r = strcmp(*(const char * const *)b, *(const char * const *)a);
     return r;
+}
 /*-
  *-----------------------------------------------------------------------
  * VarOrder --
  *	Order the words in the string.
+ *
  * Input:
  *	str		String whose words should be sorted.
  *	otype		How to order: s - sort, x - random.
+ *
  * Results:
  *	A string containing the words ordered.
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 static char *
 VarOrder(const char *str, const char otype)
+{
     Buffer buf;			/* Buffer for the new string */
     char **av;			/* word list [first word does not count] */
     char *as;			/* word list memory */
     int ac, i;
     Buf_Init(&buf, 0);
     av = brk_string(str, &ac, FALSE, &as);
     if (ac > 0) {
 	switch (otype) {
 	case 'r':		/* reverse sort alphabetically */
 	    qsort(av, ac, sizeof(char *), VarWordCompareReverse);
 	    break;
 	case 's':		/* sort alphabetically */
 	    qsort(av, ac, sizeof(char *), VarWordCompare);
 	    break;
 	case 'x':		/* randomize */
+	    {
 		/*
 		 * 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).
 		 */
 		for (i = ac - 1; i > 0; i--) {
 		    int rndidx = random() % (i + 1);
 		    char *t = av[i];
 		    av[i] = av[rndidx];
 		    av[rndidx] = t;
+		}
+	    }
+	}
+    }
     for (i = 0; i < ac; i++) {
 	Buf_AddBytes(&buf, strlen(av[i]), av[i]);
 	if (i != ac - 1)
 	    Buf_AddByte(&buf, ' ');
+    }
     free(as);
     free(av);
     return Buf_Destroy(&buf, FALSE);
+}
 /*-
  *-----------------------------------------------------------------------
  * VarUniq --
  *	Remove adjacent duplicate words.
+ *
  * Input:
  *	str		String whose words should be sorted
+ *
  * Results:
  *	A string containing the resulting words.
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 static char *
 VarUniq(const char *str)
+{
     Buffer	  buf;		/* Buffer for new string */
     char 	**av;		/* List of words to affect */
     char 	 *as;		/* Word list memory */
     int 	  ac, i, j;
     Buf_Init(&buf, 0);
     av = brk_string(str, &ac, FALSE, &as);
     if (ac > 1) {
 	for (j = 0, i = 1; i < ac; i++)
 	    if (strcmp(av[i], av[j]) != 0 && (++j != i))
 		av[j] = av[i];
 	ac = j + 1;
+    }
     for (i = 0; i < ac; i++) {
 	Buf_AddBytes(&buf, strlen(av[i]), av[i]);
 	if (i != ac - 1)
 	    Buf_AddByte(&buf, ' ');
+    }
     free(as);
     free(av);
     return Buf_Destroy(&buf, FALSE);
+}
 /*-
  *-----------------------------------------------------------------------
  * VarRange --
  *	Return an integer sequence
+ *
  * Input:
  *	str		String whose words provide default range
  *	ac		range length, if 0 use str words
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 static char *
 VarRange(const char *str, int ac)
+{
     Buffer	  buf;		/* Buffer for new string */
     char	  tmp[32];	/* each element */
     char 	**av;		/* List of words to affect */
     char 	 *as;		/* Word list memory */
     int 	  i, n;
     Buf_Init(&buf, 0);
     if (ac > 0) {
 	as = NULL;
 	av = NULL;
     } else {
 	av = brk_string(str, &ac, FALSE, &as);
+    }
     for (i = 0; i < ac; i++) {
 	n = snprintf(tmp, sizeof(tmp), "%d", 1 + i);
 	if (n >= (int)sizeof(tmp))
 	    break;
 	Buf_AddBytes(&buf, n, tmp);
 	if (i != ac - 1)
 	    Buf_AddByte(&buf, ' ');
+    }
     free(as);
     free(av);
     return Buf_Destroy(&buf, FALSE);
+}
 /*-
  * Parse a text part of a modifier such as the "from" and "to" in :S/from/to/
  * or the :@ modifier. Nested variables in the text are expanded unless
  * VARE_NOSUBST is set.
+ *
  * The text part is parsed until the next delimiter.  To escape the delimiter,
  * a backslash or a dollar, put a backslash before it.
+ *
  * Return the expanded string or NULL if the delimiter was missing.
  * If pattern is specified, handle escaped ampersands and replace unescaped
  * ampersands with the lhs of the pattern (for the :S and :C modifiers).
+ *
  * If length is specified, return the string length of the buffer.
  * If mpflags is specified and the last character of the pattern is a $,
  * set the VARP_ANCHOR_END bit of mpflags.
  */
 static char *
 ParseModifierPart(GNode *ctxt, const char **tstr, int delim,
 		  VarEvalFlags eflags, VarPatternFlags *mpflags,
 		  size_t *length, ModifyWord_SubstArgs *subst)
+{
     const char *cp;
     char *rstr;
     Buffer buf;
     size_t junk;
     VarEvalFlags errnum = eflags & VARE_UNDEFERR;
     Buf_Init(&buf, 0);
     if (length == NULL)
 	length = &junk;
     /*
      * Skim through until the matching delimiter is found;
      * pick up variable substitutions on the way. Also allow
      * backslashes to quote the delimiter, $, and \, but don't
      * touch other backslashes.
      */
     for (cp = *tstr; *cp != '\0' && *cp != delim; cp++) {
 	Boolean is_escaped = cp[0] == '\\' && (cp[1] == delim ||
 	    cp[1] == '\\' || cp[1] == '$' || (subst != NULL && cp[1] == '&'));
 	if (is_escaped) {
 	    Buf_AddByte(&buf, cp[1]);
 	    cp++;
 	} else if (*cp == '$') {
 	    if (cp[1] == delim) {	/* Unescaped $ at end of pattern */
 		if (mpflags == NULL)
 		    Buf_AddByte(&buf, *cp);
 		else
 		    *mpflags |= VARP_ANCHOR_END;
 	    } else {
 		if (!(eflags & VARE_NOSUBST)) {
 		    char   *cp2;
 		    int     len;
 		    void   *freeIt;
 		    /*
 		     * If unescaped dollar sign not before the
 		     * delimiter, assume it's a variable
 		     * substitution and recurse.
 		     */
 		    cp2 = Var_Parse(cp, ctxt, errnum | (eflags & VARE_WANTRES),
 				    &len, &freeIt);
 		    Buf_AddBytes(&buf, strlen(cp2), cp2);
 		    free(freeIt);
 		    cp += len - 1;
 		} else {
 		    const char *cp2 = &cp[1];
 		    if (*cp2 == PROPEN || *cp2 == BROPEN) {
 			/*
 			 * Find the end of this variable reference
 			 * and suck it in without further ado.
 			 * It will be interpreted later.
 			 */
 			int have = *cp2;
 			int want = (*cp2 == PROPEN) ? PRCLOSE : BRCLOSE;
 			int depth = 1;
 			for (++cp2; *cp2 != '\0' && depth > 0; ++cp2) {
 			    if (cp2[-1] != '\\') {
 				if (*cp2 == have)
 				    ++depth;
 				if (*cp2 == want)
 				    --depth;
+			    }
+			}
 			Buf_AddBytes(&buf, cp2 - cp, cp);
 			cp = --cp2;
 		    } else
 			Buf_AddByte(&buf, *cp);
+		}
+	    }
 	} else if (subst != NULL && *cp == '&')
 	    Buf_AddBytes(&buf, subst->lhsLen, subst->lhs);
 	else
 	    Buf_AddByte(&buf, *cp);
+    }
     if (*cp != delim) {
 	*tstr = cp;
 	*length = 0;
 	return NULL;
+    }
     *tstr = ++cp;
     *length = Buf_Size(&buf);
     rstr = Buf_Destroy(&buf, FALSE);
     if (DEBUG(VAR))
 	fprintf(debug_file, "Modifier part: \"%s\"\n", rstr);
     return rstr;
+}
 /*-
  *-----------------------------------------------------------------------
  * VarQuote --
  *	Quote shell meta-characters and space characters in the string
  *	if quoteDollar is set, also quote and double any '$' characters.
+ *
  * Results:
  *	The quoted string
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 static char *
 VarQuote(char *str, Boolean quoteDollar)
+{
     Buffer buf;
     Buf_Init(&buf, 0);
     for (; *str != '\0'; str++) {
 	if (*str == '\n') {
 	    const char *newline = Shell_GetNewline();
 	    if (newline == NULL)
 		newline = "\\\n";
 	    Buf_AddBytes(&buf, strlen(newline), newline);
 	    continue;
+	}
 	if (isspace((unsigned char)*str) || ismeta((unsigned char)*str))
 	    Buf_AddByte(&buf, '\\');
 	Buf_AddByte(&buf, *str);
 	if (quoteDollar && *str == '$')
 	    Buf_AddBytes(&buf, 2, "\\$");
+    }
     str = Buf_Destroy(&buf, FALSE);
     if (DEBUG(VAR))
 	fprintf(debug_file, "QuoteMeta: [%s]\n", str);
     return str;
+}
 /*-
  *-----------------------------------------------------------------------
  * VarHash --
  *      Hash the string using the MurmurHash3 algorithm.
  *      Output is computed using 32bit Little Endian arithmetic.
+ *
  * Input:
  *	str		String to modify
+ *
  * Results:
  *      Hash value of str, encoded as 8 hex digits.
+ *
  * Side Effects:
  *      None.
+ *
  *-----------------------------------------------------------------------
  */
 static char *
 VarHash(const char *str)
+{
     static const char    hexdigits[16] = "0123456789abcdef";
     Buffer         buf;
     size_t         len, len2;
     const unsigned char *ustr = (const unsigned char *)str;
     uint32_t       h, k, c1, c2;
     h  = 0x971e137bU;
     c1 = 0x95543787U;
     c2 = 0x2ad7eb25U;
     len2 = strlen(str);
     for (len = len2; len; ) {
 	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 ^= len2;
     h *= 0x85ebca6b;
     h ^= h >> 13;
     h *= 0xc2b2ae35;
     h ^= h >> 16;
     Buf_Init(&buf, 0);
     for (len = 0; len < 8; ++len) {
 	Buf_AddByte(&buf, hexdigits[h & 15]);
 	h >>= 4;
+    }
     return Buf_Destroy(&buf, FALSE);
+}
 static char *
 VarStrftime(const char *fmt, int zulu, time_t utc)
+{
     char buf[BUFSIZ];
     if (!utc)
 	time(&utc);
     if (!*fmt)
 	fmt = "%c";
     strftime(buf, sizeof(buf), fmt, zulu ? gmtime(&utc) : localtime(&utc));
     buf[sizeof(buf) - 1] = '\0';
     return bmake_strdup(buf);
+}
 typedef struct {
     /* const parameters */
     int startc;			/* '\0' or '{' or '(' */
     int endc;
     Var *v;
     GNode *ctxt;
     VarEvalFlags eflags;
     int *lengthPtr;
     void **freePtr;
     /* read-write */
     char *nstr;
     const char *start;
     const char *cp;		/* The position where parsing continues
 				 * after the current modifier. */
     char termc;			/* Character which terminated scan */
     char missing_delim;		/* For error reporting */
     int modifier;		/* that we are processing */
     Byte	sep;		/* Word separator in expansions */
     Boolean	oneBigWord;	/* TRUE if we will treat the variable as a
 				 * single big word, even if it contains
 				 * embedded spaces (as opposed to the
 				 * usual behaviour of treating it as
 				 * several space-separated words). */
     /* result */
     char *newStr;		/* New value to return */
 } ApplyModifiersState;
 /* we now have some modifiers with long names */
 #define STRMOD_MATCH(s, want, n) \
     (strncmp(s, want, n) == 0 && (s[n] == st->endc || s[n] == ':'))
 #define STRMOD_MATCHX(s, want, n) \
     (strncmp(s, want, n) == 0 && \
      (s[n] == st->endc || s[n] == ':' || s[n] == '='))
 #define CHARMOD_MATCH(c) (c == st->endc || c == ':')
 /* :@var@...${var}...@ */
 static Boolean
 ApplyModifier_Loop(const char *mod, ApplyModifiersState *st) {
     ModifyWord_LoopArgs args;
     args.ctx = st->ctxt;
     st->cp = mod + 1;
     char delim = '@';
     args.tvar = ParseModifierPart(st->ctxt, &st->cp, delim,
 				  st->eflags | VARE_NOSUBST,
 				  NULL, NULL, NULL);
     if (args.tvar == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
     args.str = ParseModifierPart(st->ctxt, &st->cp, delim,
 				 st->eflags | VARE_NOSUBST,
 				 NULL, NULL, NULL);
     if (args.str == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
     st->termc = *st->cp;
     args.eflags = st->eflags & (VARE_UNDEFERR | VARE_WANTRES);
     int prev_sep = st->sep;
     st->sep = ' ';		/* XXX: this is inconsistent */
     st->newStr = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->nstr,
 			     ModifyWord_Loop, &args);
     st->sep = prev_sep;
     Var_Delete(args.tvar, st->ctxt);
     free(args.tvar);
     free(args.str);
     return TRUE;
+}
 /* :Ddefined or :Uundefined */
 static void
 ApplyModifier_Defined(const char *mod, ApplyModifiersState *st)
+{
     Buffer buf;			/* Buffer for patterns */
     VarEvalFlags neflags;
     if (st->eflags & VARE_WANTRES) {
 	Boolean wantres;
 	if (*mod == 'U')
 	    wantres = ((st->v->flags & VAR_JUNK) != 0);
 	else
 	    wantres = ((st->v->flags & VAR_JUNK) == 0);
 	neflags = st->eflags & ~VARE_WANTRES;
 	if (wantres)
 	    neflags |= VARE_WANTRES;
     } else
 	neflags = st->eflags;
     /*
      * Pass through mod looking for 1) escaped delimiters,
      * '$'s and backslashes (place the escaped character in
      * uninterpreted) and 2) unescaped $'s that aren't before
      * the delimiter (expand the variable substitution).
      * The result is left in the Buffer buf.
      */
     Buf_Init(&buf, 0);
     for (st->cp = mod + 1;
 	 *st->cp != st->endc && *st->cp != ':' && *st->cp != '\0';
 	 st->cp++) {
 	if (*st->cp == '\\' &&
 	    (st->cp[1] == ':' || st->cp[1] == '$' || st->cp[1] == st->endc ||
 	     st->cp[1] == '\\')) {
 	    Buf_AddByte(&buf, st->cp[1]);
 	    st->cp++;
 	} else if (*st->cp == '$') {
 	    /*
 	     * If unescaped dollar sign, assume it's a
 	     * variable substitution and recurse.
 	     */
 	    char    *cp2;
 	    int	    len;
 	    void    *freeIt;
 	    cp2 = Var_Parse(st->cp, st->ctxt, neflags, &len, &freeIt);
 	    Buf_AddBytes(&buf, strlen(cp2), cp2);
 	    free(freeIt);
 	    st->cp += len - 1;
 	} else {
 	    Buf_AddByte(&buf, *st->cp);
+	}
+    }
     st->termc = *st->cp;
     if (st->v->flags & VAR_JUNK)
 	st->v->flags |= VAR_KEEP;
     if (neflags & VARE_WANTRES) {
 	st->newStr = Buf_Destroy(&buf, FALSE);
     } else {
 	st->newStr = st->nstr;
 	Buf_Destroy(&buf, TRUE);
+    }
+}
 /* :gmtime */
 static Boolean
 ApplyModifier_Gmtime(const char *mod, ApplyModifiersState *st)
+{
     time_t utc;
     char *ep;
     st->cp = mod + 1;		/* make sure it is set */
     if (!STRMOD_MATCHX(mod, "gmtime", 6))
 	return FALSE;
     if (mod[6] == '=') {
 	utc = strtoul(mod + 7, &ep, 10);
 	st->cp = ep;
     } else {
 	utc = 0;
 	st->cp = mod + 6;
+    }
     st->newStr = VarStrftime(st->nstr, 1, utc);
     st->termc = *st->cp;
     return TRUE;
+}
 /* :localtime */
 static Boolean
 ApplyModifier_Localtime(const char *mod, ApplyModifiersState *st)
+{
     time_t utc;
     char *ep;
     st->cp = mod + 1;	/* make sure it is set */
     if (!STRMOD_MATCHX(mod, "localtime", 9))
 	return FALSE;
     if (mod[9] == '=') {
 	utc = strtoul(mod + 10, &ep, 10);
 	st->cp = ep;
     } else {
 	utc = 0;
 	st->cp = mod + 9;
+    }
     st->newStr = VarStrftime(st->nstr, 0, utc);
     st->termc = *st->cp;
     return TRUE;
+}
 /* :hash */
 static Boolean
 ApplyModifier_Hash(const char *mod, ApplyModifiersState *st)
+{
     st->cp = mod + 1;	/* make sure it is set */
     if (!STRMOD_MATCH(mod, "hash", 4))
 	return FALSE;
     st->newStr = VarHash(st->nstr);
     st->cp = mod + 4;
     st->termc = *st->cp;
     return TRUE;
+}
 /* :P */
 static void
 ApplyModifier_Path(const char *mod, ApplyModifiersState *st)
+{
     if ((st->v->flags & VAR_JUNK) != 0)
 	st->v->flags |= VAR_KEEP;
     GNode *gn = Targ_FindNode(st->v->name, TARG_NOCREATE);
     if (gn == NULL || gn->type & OP_NOPATH) {
 	st->newStr = NULL;
     } else if (gn->path) {
 	st->newStr = bmake_strdup(gn->path);
     } else {
 	st->newStr = Dir_FindFile(st->v->name, Suff_FindPath(gn));
+    }
     if (!st->newStr)
 	st->newStr = bmake_strdup(st->v->name);
     st->cp = mod + 1;
     st->termc = *st->cp;
+}
 /* :!cmd! */
 static Boolean
 ApplyModifier_Exclam(const char *mod, ApplyModifiersState *st)
+{
     st->cp = mod + 1;
     char delim = '!';
     char *cmd = ParseModifierPart(st->ctxt, &st->cp, delim, st->eflags,
 				  NULL, NULL, NULL);
     if (cmd == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
     const char *emsg = NULL;
     if (st->eflags & VARE_WANTRES)
 	st->newStr = Cmd_Exec(cmd, &emsg);
     else
 	st->newStr = varNoError;
     free(cmd);
     if (emsg)
 	Error(emsg, st->nstr);
     st->termc = *st->cp;
     if (st->v->flags & VAR_JUNK)
 	st->v->flags |= VAR_KEEP;
     return TRUE;
+}
 /* :range */
 static Boolean
 ApplyModifier_Range(const char *mod, ApplyModifiersState *st)
+{
     int n;
     char *ep;
     st->cp = mod + 1;	/* make sure it is set */
     if (!STRMOD_MATCHX(mod, "range", 5))
 	return FALSE;
     if (mod[5] == '=') {
 	n = strtoul(mod + 6, &ep, 10);
 	st->cp = ep;
     } else {
 	n = 0;
 	st->cp = mod + 5;
+    }
     st->newStr = VarRange(st->nstr, n);
     st->termc = *st->cp;
     return TRUE;
+}
 /* :Mpattern or :Npattern */
 static void
 ApplyModifier_Match(const char *mod, ApplyModifiersState *st)
+{
     Boolean copy = FALSE;	/* pattern should be, or has been, copied */
     Boolean needSubst = FALSE;
     /*
      * In the loop below, ignore ':' unless we are at (or back to) the
      * original brace level.
      * XXX This will likely not work right if $() and ${} are intermixed.
      */
     int nest = 1;
     for (st->cp = mod + 1;
 	 *st->cp != '\0' && !(*st->cp == ':' && nest == 1);
 	 st->cp++) {
 	if (*st->cp == '\\' &&
 	    (st->cp[1] == ':' || st->cp[1] == st->endc ||
 	     st->cp[1] == st->startc)) {
 	    if (!needSubst)
 		copy = TRUE;
 	    st->cp++;
 	    continue;
+	}

 @@ -1,215 +1,214 @@
-# $Id: modmisc.mk,v 1.24 2020/07/26 12:18:11 rillig Exp $
+# $Id: modmisc.mk,v 1.25 2020/07/26 12:19:37 rillig Exp $
+#
 # miscellaneous modifier tests
 # do not put any dirs in this list which exist on some
 # but not all target systems - an exists() check is below.
 path=:/bin:/tmp::/:.:/no/such/dir:.
 # strip cwd from path.
 MOD_NODOT=S/:/ /g:N.:ts:
 # and decorate, note that $'s need to be doubled. Also note that
 # the modifier_variable can be used with other modifiers.
 MOD_NODOTX=S/:/ /g:N.:@d@'$$d'@
 # another mod - pretend it is more interesting
 MOD_HOMES=S,/home/,/homes/,
 MOD_OPT=@d@$${exists($$d):?$$d:$${d:S,/usr,/opt,}}@
 MOD_SEP=S,:, ,g
 all:	modvar modvarloop modsysv mod-HTE emptyvar undefvar
 all:	mod-subst
 all:	mod-regex
 all:	mod-loop-varname mod-loop-resolve mod-loop-varname-dollar
 all:	mod-subst-dollar mod-loop-dollar
 all:	mod-regex-limits
 all:	mod-regex-errors
 all:	mod-assign
 all:	mod-assign-nested
 all:	mod-tu-space
 all:	mod-quote
 all:	mod-break-many-words
 # See also sysv.mk.
 modsysv:
 	@echo "The answer is ${libfoo.a:L:libfoo.a=42}"
 # Demonstrates modifiers that are given indirectly from a variable.
 modvar:
 	@echo "path='${path}'"
 	@echo "path='${path:${MOD_NODOT}}'"
 	@echo "path='${path:S,home,homes,:${MOD_NODOT}}'"
 	@echo "path=${path:${MOD_NODOTX}:ts:}"
 	@echo "path=${path:${MOD_HOMES}:${MOD_NODOTX}:ts:}"
 .for d in ${path:${MOD_SEP}:N.} /usr/xbin
 path_$d?= ${d:${MOD_OPT}:${MOD_HOMES}}/
 paths+= ${d:${MOD_OPT}:${MOD_HOMES}}
 .endfor
 modvarloop:
 	@echo "path_/usr/xbin=${path_/usr/xbin}"
 	@echo "paths=${paths}"
 	@echo "PATHS=${paths:tu}"
 PATHNAMES=	a/b/c def a.b.c a.b/c a a.a .gitignore a a.a
 mod-HTE:
 	@echo "dirname of '"${PATHNAMES:Q}"' is '"${PATHNAMES:H:Q}"'"
 	@echo "basename of '"${PATHNAMES:Q}"' is '"${PATHNAMES:T:Q}"'"
 	@echo "suffix of '"${PATHNAMES:Q}"' is '"${PATHNAMES:E:Q}"'"
 	@echo "root of '"${PATHNAMES:Q}"' is '"${PATHNAMES:R:Q}"'"
 # When a modifier is applied to the "" variable, the result is discarded.
 emptyvar:
 	@echo S:${:S,^$,empty,}
 	@echo C:${:C,^$,empty,}
 	@echo @:${:@var@${var}@}
 # The :U modifier turns even the "" variable into something that has a value.
 # The resulting variable is empty, but is still considered to contain a
 # single empty word. This word can be accessed by the :S and :C modifiers,
 # but not by the :@ modifier since it explicitly skips empty words.
 undefvar:
 	@echo S:${:U:S,^$,empty,}
 	@echo C:${:U:C,^$,empty,}
 	@echo @:${:U:@var@empty@}
 WORDS=		sequences of letters
-# FIXME: The "*" in "letters" must not be substituted because of the 1.
+.if ${WORDS:S,e,*,1} != "s*quences of letters"
 .if ${WORDS:S,e,*,1} != "s*quences of l*tters"
 .warning ${WORDS:S,e,*,1}
 .endif
 .if ${WORDS:S,e,*,} != "s*quences of l*tters"
 .error oops
 .endif
 .if ${WORDS:S,e,*,g} != "s*qu*nc*s of l*tt*rs"
 .error oops
 .endif
 .if ${WORDS:S,^sequ,occurr,} != "occurrences of letters"
 .error oops
 .endif
 .if ${WORDS:S,^of,with,} != "sequences with letters"
 .error oops
 .endif
 .if ${WORDS:S,^office,does not match,} != ${WORDS}
 .error oops
 .endif
 mod-subst:
 	@echo $@:
 	@echo :${:Ua b b c:S,a b,,:Q}:
 	@echo :${:Ua b b c:S,a b,,1:Q}:
 	@echo :${:Ua b b c:S,a b,,W:Q}:
 	@echo :${:Ua b b c:S,b,,g:Q}:
 	@echo :${:U1 2 3 1 2 3:S,1 2,___,Wg:S,_,x,:Q}:
 	@echo ${:U12345:S,,sep,g:Q}
 mod-regex:
 	@echo $@:
 	@echo :${:Ua b b c:C,a b,,:Q}:
 	@echo :${:Ua b b c:C,a b,,1:Q}:
 	@echo :${:Ua b b c:C,a b,,W:Q}:
 	@echo :${:Uword1 word2:C,****,____,g:C,word,____,:Q}:
 	@echo :${:Ua b b c:C,b,,g:Q}:
 	@echo :${:U1 2 3 1 2 3:C,1 2,___,Wg:C,_,x,:Q}:
 # In the :@ modifier, the name of the loop variable can even be generated
 # dynamically.  There's no practical use-case for this, and hopefully nobody
 # will ever depend on this, but technically it's possible.
 mod-loop-varname:
 	@echo :${:Uone two three:@${:Ubar:S,b,v,}@+${var}+@:Q}:
 # The :@ modifier resolves the variables a little more often than expected.
 # In particular, it resolves _all_ variables from the context, and not only
 # the loop variable (in this case v).
+#
 # The d means direct reference, the i means indirect reference.
 RESOLVE=	${RES1} $${RES1}
 RES1=		1d${RES2} 1i$${RES2}
 RES2=		2d${RES3} 2i$${RES3}
 RES3=		3
 mod-loop-resolve:
 	@echo $@:${RESOLVE:@v@w${v}w@:Q}:
 # Until 2020-07-20, the variable name of the :@ modifier could end with one
 # or two dollar signs, which were silently ignored.
 # There's no point in allowing a dollar sign in that position.
 mod-loop-varname-dollar:
 	@echo $@:${1 2 3:L:@v$@($v)@:Q}.
 	@echo $@:${1 2 3:L:@v$$@($v)@:Q}.
 	@echo $@:${1 2 3:L:@v$$$@($v)@:Q}.
 # No matter how many dollar characters there are, they all get merged
 # into a single dollar by the :S modifier.
 mod-subst-dollar:
 	@echo $@:${:U1:S,^,$,:Q}:
 	@echo $@:${:U2:S,^,$$,:Q}:
 	@echo $@:${:U3:S,^,$$$,:Q}:
 	@echo $@:${:U4:S,^,$$$$,:Q}:
 	@echo $@:${:U5:S,^,$$$$$,:Q}:
 	@echo $@:${:U6:S,^,$$$$$$,:Q}:
 	@echo $@:${:U7:S,^,$$$$$$$,:Q}:
 	@echo $@:${:U8:S,^,$$$$$$$$,:Q}:
 # This generates no dollar at all:
 	@echo $@:${:UU8:S,^,${:U$$$$$$$$},:Q}:
 # Here is an alternative way to generate dollar characters.
 # It's unexpectedly complicated though.
 	@echo $@:${:U:range=5:ts\x24:C,[0-9],,g:Q}:
 # Demonstrate that it is possible to generate dollar characters using the
 # :@ modifier.
+#
 # These are edge cases that could have resulted in a parse error as well
 # since the $@ at the end could have been interpreted as a variable, which
 # would mean a missing closing @ delimiter.
 mod-loop-dollar:
 	@echo $@:${:U1:@word@${word}$@:Q}:
 	@echo $@:${:U2:@word@$${word}$$@:Q}:
 	@echo $@:${:U3:@word@$$${word}$$$@:Q}:
 	@echo $@:${:U4:@word@$$$${word}$$$$@:Q}:
 	@echo $@:${:U5:@word@$$$$${word}$$$$$@:Q}:
 	@echo $@:${:U6:@word@$$$$$${word}$$$$$$@:Q}:
 mod-regex-limits:
 	@echo $@:00-ok:${:U1 23 456:C,..,\0\0,:Q}
 	@echo $@:11-missing:${:U1 23 456:C,..,\1\1,:Q}
 	@echo $@:11-ok:${:U1 23 456:C,(.).,\1\1,:Q}
 	@echo $@:22-missing:${:U1 23 456:C,..,\2\2,:Q}
 	@echo $@:22-missing:${:U1 23 456:C,(.).,\2\2,:Q}
 	@echo $@:22-ok:${:U1 23 456:C,(.)(.),\2\2,:Q}
 	# The :C modifier only handles single-digit capturing groups,
 	# which is more than enough for daily use.
 	@echo $@:capture:${:UabcdefghijABCDEFGHIJrest:C,(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.),\9\8\7\6\5\4\3\2\1\0\10\11\12,}
 mod-regex-errors:
 	@echo $@: ${UNDEF:Uvalue:C,[,,}
 # Just a bit of basic code coverage for the obscure ::= assignment modifiers.
 mod-assign:
 	@echo $@: ${1 2 3:L:@i@${FIRST::?=$i}@} first=${FIRST}.
 	@echo $@: ${1 2 3:L:@i@${LAST::=$i}@} last=${LAST}.
 	@echo $@: ${1 2 3:L:@i@${APPENDED::+=$i}@} appended=${APPENDED}.
 	@echo $@: ${echo.1 echo.2 echo.3:L:@i@${RAN::!=${i:C,.*,&; & 1>\&2,:S,., ,g}}@} ran:${RAN}.
 	# The assignments happen in the global scope and thus are
 	# preserved even after the shell command has been run.
 	@echo $@: global: ${FIRST:Q}, ${LAST:Q}, ${APPENDED:Q}, ${RAN:Q}.
 mod-assign-nested:
 	@echo $@: ${1:?${THEN1::=then1${IT1::=t1}}:${ELSE1::=else1${IE1::=e1}}}${THEN1}${ELSE1}${IT1}${IE1}
 	@echo $@: ${0:?${THEN2::=then2${IT2::=t2}}:${ELSE2::=else2${IE2::=e2}}}${THEN2}${ELSE2}${IT2}${IE2}
 	@echo $@: ${SINK3:Q}
 	@echo $@: ${SINK4:Q}
 SINK3:=	${1:?${THEN3::=then3${IT3::=t3}}:${ELSE3::=else3${IE3::=e3}}}${THEN3}${ELSE3}${IT3}${IE3}
 SINK4:=	${0:?${THEN4::=then4${IT4::=t4}}:${ELSE4::=else4${IE4::=e4}}}${THEN4}${ELSE4}${IT4}${IE4}
 mod-tu-space:
 	# The :tu and :tl modifiers operate on the variable value
 	# as a single string, not as a list of words. Therefore,
 	# the adjacent spaces are preserved.
 	@echo $@: ${a   b:L:tu:Q}
 mod-quote:
 	@echo $@: new${.newline:Q}${.newline:Q}line
 # Cover the bmake_realloc in brk_string.
 mod-break-many-words:
 	@echo $@: ${UNDEF:U:range=500:[#]}