 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.265 2020/07/19 16:08:24 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.266 2020/07/19 16:22:44 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.265 2020/07/19 16:08:24 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.266 2020/07/19 16:22:44 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.265 2020/07/19 16:08:24 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.266 2020/07/19 16:22:44 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. The value and variable name need not
  *			    be preserved.
 @@ -2029,29 +2029,29 @@ VarRange(const char *str, int ac)
+ *
  * 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_MATCH_END bit of mpflags.
  */
 static char *
-ParseModifierPart(GNode *ctxt, Var_Parse_State *vpstate MAKE_ATTR_UNUSED,
+ParseModifierPart(GNode *ctxt, const char **tstr, int delim,
-	      VarEvalFlags eflags, const char **tstr, int delim,
+		  VarEvalFlags eflags, VarPatternFlags *mpflags,
-	      VarPatternFlags *mpflags, int *length, VarPattern *pattern)
+		  int *length, VarPattern *pattern)
+{
     const char *cp;
     char *rstr;
     Buffer buf;
     int junk;
     VarEvalFlags errnum = eflags & VARE_UNDEFERR;
     Buf_Init(&buf, 0);
     if (length == NULL)
 	length = &junk;
     /*
      * Skim through until the matching delimiter is found;
 @@ -2308,33 +2308,33 @@ typedef struct {
     (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_At(ApplyModifiersState *st) {
     VarLoop loop;
     VarPatternFlags pflags = VAR_NOSUBST; /* FIXME: mismatch between pflags and VAR_NOSUBST */
     st->cp = ++st->tstr;
     st->delim = '@';
     loop.tvar = ParseModifierPart(
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	st->ctxt, &st->cp, st->delim, st->flags,
 	&pflags, &loop.tvarLen, NULL);
     if (loop.tvar == NULL)
 	return FALSE;
     loop.str = ParseModifierPart(
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	st->ctxt, &st->cp, st->delim, st->flags,
 	&pflags, &loop.strLen, NULL);
     if (loop.str == NULL)
 	return FALSE;
     st->termc = *st->cp;
     st->delim = '\0';
     loop.flags = st->flags & (VARE_UNDEFERR | VARE_WANTRES);
     loop.ctxt = st->ctxt;
     st->newStr = VarModify(
 	st->ctxt, &st->parsestate, st->nstr, VarLoopExpand, &loop);
     Var_Delete(loop.tvar, st->ctxt);
     free(loop.tvar);
 @@ -2490,27 +2490,27 @@ ApplyModifier_Path(ApplyModifiersState *
 /* :!cmd! */
 static Boolean
 ApplyModifier_Exclam(ApplyModifiersState *st)
+{
     const char *emsg;
     VarPattern pattern;
     pattern.pflags = 0;
     st->delim = '!';
     emsg = NULL;
     st->cp = ++st->tstr;
     pattern.rhs = ParseModifierPart(
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	st->ctxt, &st->cp, st->delim, st->flags,
 	NULL, &pattern.rightLen, NULL);
     if (pattern.rhs == NULL)
 	return FALSE;
     if (st->flags & VARE_WANTRES)
 	st->newStr = Cmd_Exec(pattern.rhs, &emsg);
     else
 	st->newStr = varNoError;
     free(UNCONST(pattern.rhs));
     if (emsg)
 	Error(emsg, st->nstr);
     st->termc = *st->cp;
     st->delim = '\0';
     if (st->v->flags & VAR_JUNK)
 @@ -2642,33 +2642,33 @@ ApplyModifier_Subst(ApplyModifiersState
     st->tstr += 2;
     /*
      * If pattern begins with '^', it is anchored to the
      * start of the word -- skip over it and flag pattern.
      */
     if (*st->tstr == '^') {
 	pattern.pflags |= VARP_MATCH_START;
 	st->tstr++;
+    }
     st->cp = st->tstr;
     pattern.lhs = ParseModifierPart(
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	st->ctxt, &st->cp, st->delim, st->flags,
 	&pattern.pflags, &pattern.leftLen, NULL);
     if (pattern.lhs == NULL)
 	return FALSE;
     pattern.rhs = ParseModifierPart(
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	st->ctxt, &st->cp, st->delim, st->flags,
 	NULL, &pattern.rightLen, &pattern);
     if (pattern.rhs == NULL)
 	return FALSE;
     /*
      * Check for global substitution. If 'g' after the final
      * delimiter, substitution is global and is marked that
      * way.
      */
     for (;; st->cp++) {
 	switch (*st->cp) {
 	case 'g':
 	    pattern.pflags |= VARP_SUB_GLOBAL;
 @@ -2701,35 +2701,33 @@ ApplyModifier_Regex(ApplyModifiersState
+{
     VarREPattern    pattern;
     char           *re;
     int             error;
     Var_Parse_State tmpparsestate;
     pattern.pflags = 0;
     tmpparsestate = st->parsestate;
     st->delim = st->tstr[1];
     st->tstr += 2;
     st->cp = st->tstr;
-    re = ParseModifierPart(
+    re = ParseModifierPart(st->ctxt, &st->cp, st->delim, st->flags,
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+			   NULL, NULL, NULL);
 	NULL, NULL, NULL);
     if (re == NULL)
 	return FALSE;
-    pattern.replace = ParseModifierPart(
+    pattern.replace = ParseModifierPart(st->ctxt, &st->cp, st->delim,
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+					st->flags, NULL, NULL, NULL);
 	NULL, NULL, NULL);
     if (pattern.replace == NULL) {
 	free(re);
 	return FALSE;
+    }
     for (;; st->cp++) {
 	switch (*st->cp) {
 	case 'g':
 	    pattern.pflags |= VARP_SUB_GLOBAL;
 	    continue;
 	case '1':
 	    pattern.pflags |= VARP_SUB_ONE;
 	    continue;
 @@ -2872,40 +2870,30 @@ ApplyModifier_To(ApplyModifiersState *st
 	    return FALSE;
+	}
     } else {
 	/* Found ":t<endc>" or ":t:". */
 	return FALSE;
+    }
     return TRUE;
+}
 /* :[#], :[1], etc. */
 static int
 ApplyModifier_Words(ApplyModifiersState *st)
+{
     /*
      * Look for the closing ']', recursively
      * expanding any embedded variables.
      * estr is a pointer to the expanded result,
      * which we must free().
      */
     char *estr;
     st->cp = st->tstr + 1;	/* point to char after '[' */
     st->delim = ']';		/* look for closing ']' */
-    estr = ParseModifierPart(
+    char *estr = ParseModifierPart(st->ctxt, &st->cp, st->delim, st->flags,
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+				   NULL, NULL, NULL);
 	NULL, NULL, NULL);
     if (estr == NULL)
 	return 'c';		/* report missing ']' */
     /* now st->cp points just after the closing ']' */
     st->delim = '\0';
     if (st->cp[0] != ':' && st->cp[0] != st->endc) {
 	/* Found junk after ']' */
 	free(estr);
 	return 'b';
+    }
     if (estr[0] == '\0') {
 	/* Found empty square brackets in ":[]". */
 	free(estr);
 	return 'b';
 @@ -3047,36 +3035,34 @@ ApplyModifier_IfElse(ApplyModifiersState
     if (st->flags & VARE_WANTRES) {
 	cond_rc = Cond_EvalExpression(NULL, st->v->name, &value, 0, FALSE);
 	then_flags = cond_rc != COND_INVALID && value ? 0 : VAR_NOSUBST;
 	else_flags = cond_rc != COND_INVALID && !value ? 0 : VAR_NOSUBST;
     } else {
 	/* we are just consuming and discarding */
 	cond_rc = value = 0;
 	then_flags = else_flags = VAR_NOSUBST;
+    }
     st->cp = ++st->tstr;
     st->delim = ':';
     char *then_expr = ParseModifierPart(
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	st->ctxt, &st->cp, st->delim, st->flags, &then_flags, NULL, NULL);
 	&then_flags, NULL, NULL);
     if (then_expr == NULL)
 	return FALSE;
     /* BROPEN or PROPEN */
     st->delim = st->endc;
     char *else_expr = ParseModifierPart(
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	st->ctxt, &st->cp, st->delim, st->flags, &else_flags, NULL, NULL);
 	&else_flags, NULL, NULL);
     if (else_expr == NULL)
 	return FALSE;
     st->termc = *--st->cp;
     st->delim = '\0';
     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;
 @@ -3131,27 +3117,27 @@ ApplyModifier_Assign(ApplyModifiersState
 	case '?':
 	case '!':
 	    st->cp = &st->tstr[2];
 	    break;
 	default:
 	    st->cp = ++st->tstr;
 	    break;
+	}
 	st->delim = st->startc == PROPEN ? PRCLOSE : BRCLOSE;
 	pattern.pflags = 0;
 	pflags = (st->flags & VARE_WANTRES) ? 0 : VAR_NOSUBST;
 	pattern.rhs = ParseModifierPart(
-	    st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	    st->ctxt, &st->cp, st->delim, st->flags,
 	    &pflags, &pattern.rightLen, NULL);
 	if (st->v->flags & VAR_JUNK) {
 	    /* restore original name */
 	    free(st->v->name);
 	    st->v->name = sv_name;
+	}
 	if (pattern.rhs == NULL)
 	    return 'c';
 	st->termc = *--st->cp;
 	st->delim = '\0';
 	if (st->flags & VARE_WANTRES) {
 @@ -3242,34 +3228,34 @@ ApplyModifier_SysV(ApplyModifiersState *
 	    nest++;
 	if (nest > 0)
 	    st->cp++;
+    }
     if (*st->cp != st->endc || !eqFound)
 	return 0;
     st->delim = '=';
     st->cp = st->tstr;
     /* FIXME: There's no point in having a single $ at the end of a
      * SysV substitution since that will not be interpreted as an
      * anchor anyway. */
     pattern.lhs = ParseModifierPart(
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	st->ctxt, &st->cp, st->delim, st->flags,
 	&pattern.pflags, &pattern.leftLen, NULL);
     if (pattern.lhs == NULL)
 	return 'c';
     st->delim = st->endc;
     pattern.rhs = ParseModifierPart(
-	st->ctxt, &st->parsestate, st->flags, &st->cp, st->delim,
+	st->ctxt, &st->cp, st->delim, st->flags,
 	NULL, &pattern.rightLen, &pattern);
     if (pattern.rhs == NULL)
 	return 'c';
     /*
      * SYSV modifications happen through the whole
      * string. Note the pattern is anchored at the end.
      */
     st->termc = *--st->cp;
     st->delim = '\0';
     if (pattern.leftLen == 0 && *st->nstr == '\0') {
 	st->newStr = st->nstr;	/* special case */
     } else {