 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.347 2020/07/27 23:04:18 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.348 2020/07/27 23:24:55 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.
 @@ -59,34 +59,34 @@
  * 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.347 2020/07/27 23:04:18 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.348 2020/07/27 23:24:55 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.347 2020/07/27 23:04:18 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.348 2020/07/27 23:24:55 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.
+ *
 @@ -2036,27 +2036,27 @@ VarStrftime(const char *fmt, int zulu, t
     return bmake_strdup(buf);
+}
 typedef struct {
     /* const parameters */
     int startc;			/* '\0' or '{' or '(' */
     int endc;
     Var *v;
     GNode *ctxt;
     VarEvalFlags eflags;
     /* read-write */
     char *nstr;
-    const char *cp;		/* The position where parsing continues
+    const char *next;		/* The position where parsing continues
 				 * after the current modifier. */
     char termc;			/* Character which terminated scan */
     char missing_delim;		/* For error reporting */
     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 */
 @@ -2075,43 +2075,43 @@ static inline Boolean
 ModMatchEq(const char *mod, const char *modname, char endc)
+{
     size_t n = strlen(modname);
     return strncmp(mod, modname, n) == 0 &&
 	   (mod[n] == endc || mod[n] == ':' || mod[n] == '=');
+}
 /* :@var@...${var}...@ */
 static Boolean
 ApplyModifier_Loop(const char *mod, ApplyModifiersState *st) {
     ModifyWord_LoopArgs args;
     args.ctx = st->ctxt;
-    st->cp = mod + 1;
+    st->next = mod + 1;
     char delim = '@';
-    args.tvar = ParseModifierPart(&st->cp, delim, st->eflags & ~VARE_WANTRES,
+    args.tvar = ParseModifierPart(&st->next, delim, st->eflags & ~VARE_WANTRES,
 				  st->ctxt, NULL, NULL, NULL);
     if (args.tvar == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
-    args.str = ParseModifierPart(&st->cp, delim, st->eflags & ~VARE_WANTRES,
+    args.str = ParseModifierPart(&st->next, delim, st->eflags & ~VARE_WANTRES,
 				 st->ctxt, NULL, NULL, NULL);
     if (args.str == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
-    st->termc = *st->cp;
+    st->termc = *st->next;
     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;
+}
 @@ -2157,169 +2157,169 @@ ApplyModifier_Defined(const char *mod, A
 	    int	    len;
 	    void    *freeIt;
 	    cp2 = Var_Parse(p, st->ctxt, neflags, &len, &freeIt);
 	    Buf_AddStr(&buf, cp2);
 	    free(freeIt);
 	    p += len;
 	} else {
 	    Buf_AddByte(&buf, *p);
 	    p++;
+	}
+    }
-    st->cp = p;
+    st->next = p;
-    st->termc = *st->cp;
+    st->termc = *st->next;
     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)
+{
     if (!ModMatchEq(mod, "gmtime", st->endc)) {
-	st->cp = mod + 1;
+	st->next = mod + 1;
 	return FALSE;
+    }
     time_t utc;
     if (mod[6] == '=') {
 	char *ep;
 	utc = strtoul(mod + 7, &ep, 10);
-	st->cp = ep;
+	st->next = ep;
     } else {
 	utc = 0;
-	st->cp = mod + 6;
+	st->next = mod + 6;
+    }
     st->newStr = VarStrftime(st->nstr, 1, utc);
-    st->termc = *st->cp;
+    st->termc = *st->next;
     return TRUE;
+}
 /* :localtime */
 static Boolean
 ApplyModifier_Localtime(const char *mod, ApplyModifiersState *st)
+{
     if (!ModMatchEq(mod, "localtime", st->endc)) {
-	st->cp = mod + 1;
+	st->next = mod + 1;
 	return FALSE;
+    }
     time_t utc;
     if (mod[9] == '=') {
 	char *ep;
 	utc = strtoul(mod + 10, &ep, 10);
-	st->cp = ep;
+	st->next = ep;
     } else {
 	utc = 0;
-	st->cp = mod + 9;
+	st->next = mod + 9;
+    }
     st->newStr = VarStrftime(st->nstr, 0, utc);
-    st->termc = *st->cp;
+    st->termc = *st->next;
     return TRUE;
+}
 /* :hash */
 static Boolean
 ApplyModifier_Hash(const char *mod, ApplyModifiersState *st)
+{
     if (!ModMatch(mod, "hash", st->endc)) {
-	st->cp = mod + 1;
+	st->next = mod + 1;
 	return FALSE;
+    }
     st->newStr = VarHash(st->nstr);
-    st->cp = mod + 4;
+    st->next = mod + 4;
-    st->termc = *st->cp;
+    st->termc = *st->next;
     return TRUE;
+}
 /* :P */
 static void
 ApplyModifier_Path(const char *mod, ApplyModifiersState *st)
+{
     if (st->v->flags & VAR_JUNK)
 	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->next = mod + 1;
-    st->termc = *st->cp;
+    st->termc = *st->next;
+}
 /* :!cmd! */
 static Boolean
 ApplyModifier_Exclam(const char *mod, ApplyModifiersState *st)
+{
-    st->cp = mod + 1;
+    st->next = mod + 1;
     char delim = '!';
-    char *cmd = ParseModifierPart(&st->cp, delim, st->eflags, st->ctxt,
+    char *cmd = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				  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;
+    st->termc = *st->next;
     if (st->v->flags & VAR_JUNK)
 	st->v->flags |= VAR_KEEP;
     return TRUE;
+}
 /* :range */
 static Boolean
 ApplyModifier_Range(const char *mod, ApplyModifiersState *st)
+{
     if (!ModMatchEq(mod, "range", st->endc)) {
-	st->cp = mod + 1;
+	st->next = mod + 1;
 	return FALSE;
+    }
     int n;
     if (mod[5] == '=') {
 	char *ep;
 	n = strtoul(mod + 6, &ep, 10);
-	st->cp = ep;
+	st->next = ep;
     } else {
 	n = 0;
-	st->cp = mod + 5;
+	st->next = mod + 5;
+    }
     st->newStr = VarRange(st->nstr, n);
-    st->termc = *st->cp;
+    st->termc = *st->next;
     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.
 @@ -2334,29 +2334,29 @@ ApplyModifier_Match(const char *mod, App
 	    p++;
 	    continue;
+	}
 	if (*p == '$')
 	    needSubst = TRUE;
 	if (*p == '(' || *p == '{')
 	    ++nest;
 	if (*p == ')' || *p == '}') {
 	    --nest;
 	    if (nest == 0)
 		break;
+	}
+    }
-    st->cp = p;
+    st->next = p;
-    st->termc = *st->cp;
+    st->termc = *st->next;
-    const char *endpat = st->cp;
+    const char *endpat = st->next;
     char *pattern;
     if (copy) {
 	/* Compress the \:'s out of the pattern. */
 	pattern = bmake_malloc(endpat - (mod + 1) + 1);
 	char *dst = pattern;
 	const char *src = mod + 1;
 	for (; src < endpat; src++, dst++) {
 	    if (src[0] == '\\' && src + 1 < endpat &&
 		/* XXX: st->startc is missing here; see above */
 		(src[1] == ':' || src[1] == st->endc))
 		src++;
 	    *dst = *src;
 @@ -2387,128 +2387,128 @@ ApplyModifier_Match(const char *mod, App
     st->newStr = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->nstr,
 			     callback, pattern);
     free(pattern);
+}
 /* :S,from,to, */
 static Boolean
 ApplyModifier_Subst(const char * const mod, ApplyModifiersState *st)
+{
     ModifyWord_SubstArgs args;
     Boolean oneBigWord = st->oneBigWord;
     char delim = mod[1];
-    st->cp = mod + 2;
+    st->next = mod + 2;
     /*
      * If pattern begins with '^', it is anchored to the
      * start of the word -- skip over it and flag pattern.
      */
     args.pflags = 0;
-    if (*st->cp == '^') {
+    if (*st->next == '^') {
 	args.pflags |= VARP_ANCHOR_START;
-	st->cp++;
+	st->next++;
+    }
-    char *lhs = ParseModifierPart(&st->cp, delim, st->eflags, st->ctxt,
+    char *lhs = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				  &args.lhsLen, &args.pflags, NULL);
     if (lhs == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
     args.lhs = lhs;
-    char *rhs = ParseModifierPart(&st->cp, delim, st->eflags, st->ctxt,
+    char *rhs = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				  &args.rhsLen, NULL, &args);
     if (rhs == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
     args.rhs = rhs;
     /*
      * Check for global substitution. If 'g' after the final
      * delimiter, substitution is global and is marked that
      * way.
      */
-    for (;; st->cp++) {
+    for (;; st->next++) {
-	switch (*st->cp) {
+	switch (*st->next) {
 	case 'g':
 	    args.pflags |= VARP_SUB_GLOBAL;
 	    continue;
 	case '1':
 	    args.pflags |= VARP_SUB_ONE;
 	    continue;
 	case 'W':
 	    oneBigWord = TRUE;
 	    continue;
+	}
 	break;
+    }
-    st->termc = *st->cp;
+    st->termc = *st->next;
     st->newStr = ModifyWords(st->ctxt, st->sep, oneBigWord, st->nstr,
 			     ModifyWord_Subst, &args);
     free(lhs);
     free(rhs);
     return TRUE;
+}
 #ifndef NO_REGEX
 /* :C,from,to, */
 static Boolean
 ApplyModifier_Regex(const char *mod, ApplyModifiersState *st)
+{
     ModifyWord_SubstRegexArgs args;
     args.pflags = 0;
     Boolean oneBigWord = st->oneBigWord;
     char delim = mod[1];
-    st->cp = mod + 2;
+    st->next = mod + 2;
-    char *re = ParseModifierPart(&st->cp, delim, st->eflags, st->ctxt,
+    char *re = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				 NULL, NULL, NULL);
     if (re == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
-    args.replace = ParseModifierPart(&st->cp, delim, st->eflags, st->ctxt,
+    args.replace = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				     NULL, NULL, NULL);
     if (args.replace == NULL) {
 	free(re);
 	st->missing_delim = delim;
 	return FALSE;
+    }
-    for (;; st->cp++) {
+    for (;; st->next++) {
-	switch (*st->cp) {
+	switch (*st->next) {
 	case 'g':
 	    args.pflags |= VARP_SUB_GLOBAL;
 	    continue;
 	case '1':
 	    args.pflags |= VARP_SUB_ONE;
 	    continue;
 	case 'W':
 	    oneBigWord = TRUE;
 	    continue;
+	}
 	break;
+    }
-    st->termc = *st->cp;
+    st->termc = *st->next;
     int error = regcomp(&args.re, re, REG_EXTENDED);
     free(re);
     if (error) {
 	VarREError(error, &args.re, "RE substitution error");
 	free(args.replace);
 	return FALSE;
+    }
     args.nsub = args.re.re_nsub + 1;
     if (args.nsub < 1)
 	args.nsub = 1;
     if (args.nsub > 10)
 @@ -2524,132 +2524,132 @@ ApplyModifier_Regex(const char *mod, App
 static void
 ModifyWord_Copy(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
+{
     SepBuf_AddStr(buf, word);
+}
 /* :ts<separator> */
 static Boolean
 ApplyModifier_ToSep(const char *sep, ApplyModifiersState *st)
+{
     if (sep[0] != st->endc && (sep[1] == st->endc || sep[1] == ':')) {
 	/* ":ts<unrecognised><endc>" or ":ts<unrecognised>:" */
 	st->sep = sep[0];
-	st->cp = sep + 1;
+	st->next = sep + 1;
     } else if (sep[0] == st->endc || sep[0] == ':') {
 	/* ":ts<endc>" or ":ts:" */
 	st->sep = '\0';		/* no separator */
-	st->cp = sep;
+	st->next = sep;
     } else if (sep[0] == '\\') {
 	const char *xp = sep + 1;
 	int base = 8;		/* assume octal */
 	switch (sep[1]) {
 	case 'n':
 	    st->sep = '\n';
-	    st->cp = sep + 2;
+	    st->next = sep + 2;
 	    break;
 	case 't':
 	    st->sep = '\t';
-	    st->cp = sep + 2;
+	    st->next = sep + 2;
 	    break;
 	case 'x':
 	    base = 16;
 	    xp++;
 	    goto get_numeric;
 	case '0':
 	    base = 0;
 	    goto get_numeric;
 	default:
 	    if (!isdigit((unsigned char)sep[1]))
 		return FALSE;	/* ":ts<backslash><unrecognised>". */
 	    char *end;
 	get_numeric:
 	    st->sep = strtoul(sep + 1 + (sep[1] == 'x'), &end, base);
 	    if (*end != ':' && *end != st->endc)
 	        return FALSE;
-	    st->cp = end;
+	    st->next = end;
 	    break;
+	}
     } else {
 	return FALSE;		/* Found ":ts<unrecognised><unrecognised>". */
+    }
-    st->termc = *st->cp;
+    st->termc = *st->next;
     st->newStr = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->nstr,
 			     ModifyWord_Copy, NULL);
     return TRUE;
+}
 /* :tA, :tu, :tl, :ts<separator>, etc. */
 static Boolean
 ApplyModifier_To(const char *mod, ApplyModifiersState *st)
+{
-    st->cp = mod + 1;	/* make sure it is set */
+    st->next = mod + 1;	/* make sure it is set */
     if (mod[1] == st->endc || mod[1] == ':')
 	return FALSE;		/* Found ":t<endc>" or ":t:". */
     if (mod[1] == 's')
 	return ApplyModifier_ToSep(mod + 2, st);
     if (mod[2] != st->endc && mod[2] != ':')
 	return FALSE;		/* Found ":t<unrecognised><unrecognised>". */
     /* Check for two-character options: ":tu", ":tl" */
     if (mod[1] == 'A') {	/* absolute path */
 	st->newStr = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->nstr,
 				 ModifyWord_Realpath, NULL);
-	st->cp = mod + 2;
+	st->next = mod + 2;
-	st->termc = *st->cp;
+	st->termc = *st->next;
     } else if (mod[1] == 'u') {
 	char *dp = bmake_strdup(st->nstr);
 	for (st->newStr = dp; *dp; dp++)
 	    *dp = toupper((unsigned char)*dp);
-	st->cp = mod + 2;
+	st->next = mod + 2;
-	st->termc = *st->cp;
+	st->termc = *st->next;
     } else if (mod[1] == 'l') {
 	char *dp = bmake_strdup(st->nstr);
 	for (st->newStr = dp; *dp; dp++)
 	    *dp = tolower((unsigned char)*dp);
-	st->cp = mod + 2;
+	st->next = mod + 2;
-	st->termc = *st->cp;
+	st->termc = *st->next;
     } else if (mod[1] == 'W' || mod[1] == 'w') {
 	st->oneBigWord = mod[1] == 'W';
 	st->newStr = st->nstr;
-	st->cp = mod + 2;
+	st->next = mod + 2;
-	st->termc = *st->cp;
+	st->termc = *st->next;
     } else {
 	/* Found ":t<unrecognised>:" or ":t<unrecognised><endc>". */
 	return FALSE;
+    }
     return TRUE;
+}
 /* :[#], :[1], etc. */
 static int
 ApplyModifier_Words(const char *mod, ApplyModifiersState *st)
+{
-    st->cp = mod + 1;		/* point to char after '[' */
+    st->next = mod + 1;		/* point to char after '[' */
     char delim = ']';		/* look for closing ']' */
-    char *estr = ParseModifierPart(&st->cp, delim, st->eflags, st->ctxt,
+    char *estr = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				   NULL, NULL, NULL);
     if (estr == NULL) {
 	st->missing_delim = delim;
 	return 'c';
+    }
-    /* now st->cp points just after the closing ']' */
+    /* now st->next points just after the closing ']' */
-    if (st->cp[0] != ':' && st->cp[0] != st->endc)
+    if (st->next[0] != ':' && st->next[0] != st->endc)
 	goto bad_modifier;	/* Found junk after ']' */
     if (estr[0] == '\0')
 	goto bad_modifier;	/* empty square brackets in ":[]". */
     if (estr[0] == '#' && estr[1] == '\0') { /* Found ":[#]" */
 	if (st->oneBigWord) {
 	    st->newStr = bmake_strdup("1");
 	} else {
 	    /* XXX: brk_string() is a rather expensive
 	     * way of counting words. */
 	    char *as;
 	    int ac;
 @@ -2709,92 +2709,92 @@ ApplyModifier_Words(const char *mod, App
 	st->oneBigWord = TRUE;
 	st->newStr = st->nstr;
 	goto ok;
+    }
     /* ":[0..N]" or ":[N..0]" */
     if (first == 0 || last == 0)
 	goto bad_modifier;
     /* Normal case: select the words described by seldata. */
     st->newStr = VarSelectWords(st->sep, st->oneBigWord, st->nstr, first, last);
 ok:
-    st->termc = *st->cp;
+    st->termc = *st->next;
     free(estr);
     return 0;
 bad_modifier:
     free(estr);
     return 'b';
+}
 /* :O or :Ox */
 static Boolean
 ApplyModifier_Order(const char *mod, ApplyModifiersState *st)
+{
     char otype;
-    st->cp = mod + 1;	/* skip to the rest in any case */
+    st->next = mod + 1;	/* skip to the rest in any case */
     if (mod[1] == st->endc || mod[1] == ':') {
 	otype = 's';
-	st->termc = *st->cp;
+	st->termc = *st->next;
     } else if ((mod[1] == 'r' || mod[1] == 'x') &&
 	       (mod[2] == st->endc || mod[2] == ':')) {
 	otype = mod[1];
-	st->cp = mod + 2;
+	st->next = mod + 2;
-	st->termc = *st->cp;
+	st->termc = *st->next;
     } else {
 	return FALSE;
+    }
     st->newStr = VarOrder(st->nstr, otype);
     return TRUE;
+}
 /* :? then : else */
 static Boolean
 ApplyModifier_IfElse(const char *mod, ApplyModifiersState *st)
+{
     Boolean value = FALSE;
     int cond_rc = 0;
     VarEvalFlags then_eflags = st->eflags & ~VARE_WANTRES;
     VarEvalFlags else_eflags = st->eflags & ~VARE_WANTRES;
     if (st->eflags & VARE_WANTRES) {
 	cond_rc = Cond_EvalExpression(NULL, st->v->name, &value, 0, FALSE);
 	if (cond_rc != COND_INVALID && value)
 	    then_eflags |= VARE_WANTRES;
 	if (cond_rc != COND_INVALID && !value)
 	    else_eflags |= VARE_WANTRES;
+    }
-    st->cp = mod + 1;
+    st->next = mod + 1;
     char delim = ':';
-    char *then_expr = ParseModifierPart(&st->cp, delim, then_eflags, st->ctxt,
+    char *then_expr = ParseModifierPart(&st->next, delim, then_eflags, st->ctxt,
 					NULL, NULL, NULL);
     if (then_expr == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
     delim = st->endc;		/* BRCLOSE or PRCLOSE */
-    char *else_expr = ParseModifierPart(&st->cp, delim, else_eflags, st->ctxt,
+    char *else_expr = ParseModifierPart(&st->next, delim, else_eflags, st->ctxt,
 					NULL, NULL, NULL);
     if (else_expr == NULL) {
 	st->missing_delim = delim;
 	return FALSE;
+    }
-    st->termc = *--st->cp;
+    st->termc = *--st->next;
     if (cond_rc == COND_INVALID) {
 	Error("Bad conditional expression `%s' in %s?%s:%s",
 	    st->v->name, st->v->name, then_expr, else_expr);
 	return FALSE;
+    }
     if (value) {
 	st->newStr = then_expr;
 	free(else_expr);
     } else {
 	st->newStr = else_expr;
 	free(then_expr);
+    }
 @@ -2848,47 +2848,47 @@ ApplyModifier_Assign(const char *mod, Ap
 	st->v->name = bmake_strdup(st->v->name);
     } else if (st->ctxt != VAR_GLOBAL) {
 	Var *gv = VarFind(st->v->name, st->ctxt, 0);
 	if (gv == NULL)
 	    v_ctxt = VAR_GLOBAL;
 	else
 	    VarFreeEnv(gv, TRUE);
+    }
     switch (op[0]) {
     case '+':
     case '?':
     case '!':
-	st->cp = mod + 3;
+	st->next = mod + 3;
 	break;
     default:
-	st->cp = mod + 2;
+	st->next = mod + 2;
 	break;
+    }
     char delim = st->startc == PROPEN ? PRCLOSE : BRCLOSE;
-    char *val = ParseModifierPart(&st->cp, delim, st->eflags, st->ctxt,
+    char *val = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				  NULL, NULL, NULL);
     if (st->v->flags & VAR_JUNK) {
 	/* restore original name */
 	free(st->v->name);
 	st->v->name = sv_name;
+    }
     if (val == NULL) {
 	st->missing_delim = delim;
 	return 'c';
+    }
-    st->termc = *--st->cp;
+    st->termc = *--st->next;
     if (st->eflags & VARE_WANTRES) {
 	switch (op[0]) {
 	case '+':
 	    Var_Append(st->v->name, val, v_ctxt);
 	    break;
 	case '!': {
 	    const char *emsg;
 	    st->newStr = Cmd_Exec(val, &emsg);
 	    if (emsg)
 		Error(emsg, st->nstr);
 	    else
 		Var_Set(st->v->name, st->newStr, v_ctxt);
 @@ -2904,95 +2904,95 @@ ApplyModifier_Assign(const char *mod, Ap
 	    break;
+	}
+    }
     free(val);
     st->newStr = varNoError;
     return 0;
+}
 /* remember current value */
 static Boolean
 ApplyModifier_Remember(const char *mod, ApplyModifiersState *st)
+{
     if (!ModMatchEq(mod, "_", st->endc)) {
-	st->cp = mod + 1;
+	st->next = mod + 1;
 	return FALSE;
+    }
     if (mod[1] == '=') {
 	size_t n = strcspn(mod + 2, ":)}");
 	char *name = bmake_strndup(mod + 2, n);
 	Var_Set(name, st->nstr, st->ctxt);
 	free(name);
-	st->cp = mod + 2 + n;
+	st->next = mod + 2 + n;
     } else {
 	Var_Set("_", st->nstr, st->ctxt);
-	st->cp = mod + 1;
+	st->next = mod + 1;
+    }
     st->newStr = st->nstr;
-    st->termc = *st->cp;
+    st->termc = *st->next;
     return TRUE;
+}
 #ifdef SYSVVARSUB
 /* :from=to */
 static int
 ApplyModifier_SysV(const char *mod, ApplyModifiersState *st)
+{
     Boolean eqFound = FALSE;
     /*
      * First we make a pass through the string trying
      * to verify it is a SYSV-make-style translation:
      * it must be: <string1>=<string2>)
      */
-    st->cp = mod;
+    st->next = mod;
     int nest = 1;
-    while (*st->cp != '\0' && nest > 0) {
+    while (*st->next != '\0' && nest > 0) {
-	if (*st->cp == '=') {
+	if (*st->next == '=') {
 	    eqFound = TRUE;
 	    /* continue looking for st->endc */
-	} else if (*st->cp == st->endc)
+	} else if (*st->next == st->endc)
 	    nest--;
-	else if (*st->cp == st->startc)
+	else if (*st->next == st->startc)
 	    nest++;
 	if (nest > 0)
-	    st->cp++;
+	    st->next++;
+    }
-    if (*st->cp != st->endc || !eqFound)
+    if (*st->next != st->endc || !eqFound)
 	return 0;
     char delim = '=';
-    st->cp = mod;
+    st->next = mod;
-    char *lhs = ParseModifierPart(&st->cp, delim, st->eflags, st->ctxt,
+    char *lhs = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				  NULL, NULL, NULL);
     if (lhs == NULL) {
 	st->missing_delim = delim;
 	return 'c';
+    }
     delim = st->endc;
-    char *rhs = ParseModifierPart(&st->cp, delim, st->eflags, st->ctxt,
+    char *rhs = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				  NULL, NULL, NULL);
     if (rhs == NULL) {
 	st->missing_delim = delim;
 	return 'c';
+    }
     /*
      * SYSV modifications happen through the whole
      * string. Note the pattern is anchored at the end.
      */
-    st->termc = *--st->cp;
+    st->termc = *--st->next;
     if (lhs[0] == '\0' && *st->nstr == '\0') {
 	st->newStr = st->nstr;	/* special case */
     } else {
 	ModifyWord_SYSVSubstArgs args = { st->ctxt, lhs, rhs };
 	st->newStr = ModifyWords(st->ctxt, st->sep, st->oneBigWord, st->nstr,
 				 ModifyWord_SYSVSubst, &args);
+    }
     free(lhs);
     free(rhs);
     return '=';
+}
 #endif
 @@ -3154,28 +3154,28 @@ ApplyModifiers(char *nstr, const char *
 	case '_':
 	    if (!ApplyModifier_Remember(p, &st))
 		goto default_case;
 	    break;
 	case 'D':
 	case 'U':
 	    ApplyModifier_Defined(p, &st);
 	    break;
 	case 'L':
+	    {
 		if (st.v->flags & VAR_JUNK)
 		    st.v->flags |= VAR_KEEP;
 		st.newStr = bmake_strdup(st.v->name);
-		st.cp = p + 1;
+		st.next = p + 1;
-		st.termc = *st.cp;
+		st.termc = *st.next;
 		break;
+	    }
 	case 'P':
 	    ApplyModifier_Path(p, &st);
 	    break;
 	case '!':
 	    if (!ApplyModifier_Exclam(p, &st))
 		goto cleanup;
 	    break;
 	case '[':
+	    {
 		int res = ApplyModifier_Words(p, &st);
 		if (res == 'b')
 @@ -3212,153 +3212,154 @@ ApplyModifiers(char *nstr, const char *
 	    if (!ApplyModifier_IfElse(p, &st))
 		goto cleanup;
 	    break;
 #ifndef NO_REGEX
 	case 'C':
 	    if (!ApplyModifier_Regex(p, &st))
 		goto cleanup;
 	    break;
 #endif
 	case 'q':
 	case 'Q':
 	    if (p[1] == st.endc || p[1] == ':') {
 		st.newStr = VarQuote(st.nstr, modifier == 'q');
-		st.cp = p + 1;
+		st.next = p + 1;
-		st.termc = *st.cp;
+		st.termc = *st.next;
 		break;
+	    }
 	    goto default_case;
 	case 'T':
 	    if (p[1] == st.endc || p[1] == ':') {
 		st.newStr = ModifyWords(st.ctxt, st.sep, st.oneBigWord,
 					st.nstr, ModifyWord_Tail, NULL);
-		st.cp = p + 1;
+		st.next = p + 1;
-		st.termc = *st.cp;
+		st.termc = *st.next;
 		break;
+	    }
 	    goto default_case;
 	case 'H':
 	    if (p[1] == st.endc || p[1] == ':') {
 		st.newStr = ModifyWords(st.ctxt, st.sep, st.oneBigWord,
 					st.nstr, ModifyWord_Head, NULL);
-		st.cp = p + 1;
+		st.next = p + 1;
-		st.termc = *st.cp;
+		st.termc = *st.next;
 		break;
+	    }
 	    goto default_case;
 	case 'E':
 	    if (p[1] == st.endc || p[1] == ':') {
 		st.newStr = ModifyWords(st.ctxt, st.sep, st.oneBigWord,
 					st.nstr, ModifyWord_Suffix, NULL);
-		st.cp = p + 1;
+		st.next = p + 1;
-		st.termc = *st.cp;
+		st.termc = *st.next;
 		break;
+	    }
 	    goto default_case;
 	case 'R':
 	    if (p[1] == st.endc || p[1] == ':') {
 		st.newStr = ModifyWords(st.ctxt, st.sep, st.oneBigWord,
 					st.nstr, ModifyWord_Root, NULL);
-		st.cp = p + 1;
+		st.next = p + 1;
-		st.termc = *st.cp;
+		st.termc = *st.next;
 		break;
+	    }
 	    goto default_case;
 	case 'r':
 	    if (!ApplyModifier_Range(p, &st))
 		goto default_case;
 	    break;
 	case 'O':
 	    if (!ApplyModifier_Order(p, &st))
 		goto bad_modifier;
 	    break;
 	case 'u':
 	    if (p[1] == st.endc || p[1] == ':') {
 		st.newStr = VarUniq(st.nstr);
-		st.cp = p + 1;
+		st.next = p + 1;
-		st.termc = *st.cp;
+		st.termc = *st.next;
 		break;
+	    }
 	    goto default_case;
 #ifdef SUNSHCMD
 	case 's':
 	    if (p[1] == 'h' && (p[2] == st.endc || p[2] == ':')) {
 		const char *emsg;
 		if (st.eflags & VARE_WANTRES) {
 		    st.newStr = Cmd_Exec(st.nstr, &emsg);
 		    if (emsg)
 			Error(emsg, st.nstr);
 		} else
 		    st.newStr = varNoError;
-		st.cp = p + 2;
+		st.next = p + 2;
-		st.termc = *st.cp;
+		st.termc = *st.next;
 		break;
+	    }
 	    goto default_case;
 #endif
 	default:
 	default_case:
+	    {
 #ifdef SYSVVARSUB
 		int res = ApplyModifier_SysV(p, &st);
 		if (res == 'c')
 		    goto cleanup;
 		if (res != '=')
 #endif
+		{
 		    Error("Unknown modifier '%c'", *p);
-		    for (st.cp = p + 1;
+		    for (st.next = p + 1;
-			 *st.cp != ':' && *st.cp != st.endc && *st.cp != '\0';
+			 *st.next != ':' && *st.next != st.endc &&
-			 st.cp++)
+			 *st.next != '\0';
 			 st.next++)
 			continue;
-		    st.termc = *st.cp;
+		    st.termc = *st.next;
 		    st.newStr = var_Error;
+		}
+	    }
+	}
 	if (DEBUG(VAR)) {
 	    fprintf(debug_file, "Result[%s] of :%c is \"%s\"\n",
 		st.v->name, modifier, st.newStr);
+	}
 	if (st.newStr != st.nstr) {
 	    if (*freePtr) {
 		free(st.nstr);
 		*freePtr = NULL;
+	    }
 	    st.nstr = st.newStr;
 	    if (st.nstr != var_Error && st.nstr != varNoError) {
 		*freePtr = st.nstr;
+	    }
+	}
 	if (st.termc == '\0' && st.endc != '\0') {
 	    Error("Unclosed variable specification (expecting '%c') "
 		"for \"%s\" (value \"%s\") modifier %c",
 		st.endc, st.v->name, st.nstr, modifier);
 	} else if (st.termc == ':') {
-	    st.cp++;
+	    st.next++;
+	}
-	p = st.cp;
+	p = st.next;
+    }
 out:
     *lengthPtr = p - tstr;
     return st.nstr;
 bad_modifier:
     Error("Bad modifier `:%.*s' for %s",
 	  (int)strcspn(p, ":)}"), p, st.v->name);
 cleanup:
-    *lengthPtr = st.cp - tstr;
+    *lengthPtr = st.next - tstr;
     if (st.missing_delim != '\0')
 	Error("Unclosed substitution for %s (%c missing)",
 	      st.v->name, st.missing_delim);
     free(*freePtr);
     *freePtr = NULL;
     return var_Error;
+}
 static Boolean
 VarIsDynamic(GNode *ctxt, const char *varname, size_t namelen)
+{
     if ((namelen == 1 ||
 	 (namelen == 2 && (varname[1] == 'F' || varname[1] == 'D'))) &&