 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.340 2020/07/27 21:54:25 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.341 2020/07/27 22:02:26 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.340 2020/07/27 21:54:25 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.341 2020/07/27 22:02:26 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.340 2020/07/27 21:54:25 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.341 2020/07/27 22:02:26 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.
+ *
 @@ -2043,27 +2043,26 @@ typedef struct {
     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 */
 @@ -3070,27 +3069,27 @@ ApplyModifier_SysV(const char *mod, Appl
  *	  :!<cmd>!	Run cmd much the same as :sh run's the
  *			current value of the variable.
  * Assignment operators (see ApplyModifier_Assign).
  */
 static char *
 ApplyModifiers(char *nstr, const char *tstr,
 	       int const startc, int const endc,
 	       Var * const v, GNode * const ctxt, VarEvalFlags const eflags,
 	       int * const lengthPtr, void ** const freePtr)
+{
     ApplyModifiersState st = {
 	startc, endc, v, ctxt, eflags, lengthPtr, freePtr,
 	nstr, tstr, tstr,
-	'\0', '\0', 0, ' ', FALSE, NULL
+	'\0', '\0', ' ', FALSE, NULL
     };
     const char *p = tstr;
     while (*p != '\0' && *p != endc) {
 	if (*p == '$') {
 	    /*
 	     * We may have some complex modifiers in a variable.
 	     */
 	    void *freeIt;
 	    const char *rval;
 	    int rlen;
 	    int c;
 @@ -3134,27 +3133,28 @@ ApplyModifiers(char *nstr, const char *t
 	    else if (*p == '\0' && endc != '\0') {
 		Error("Unclosed variable specification after complex "
 		    "modifier (expecting '%c') for %s", st.endc, st.v->name);
 		goto out;
+	    }
 	    continue;
+	}
     apply_mods:
 	if (DEBUG(VAR)) {
 	    fprintf(debug_file, "Applying[%s] :%c to \"%s\"\n", st.v->name,
 		*p, st.nstr);
+	}
 	st.newStr = var_Error;
-	switch ((st.modifier = *p)) {
+	char modifier = *p;
 	switch (modifier) {
 	case ':':
+	    {
 		int res = ApplyModifier_Assign(p, &st);
 		if (res == 'b')
 		    goto bad_modifier;
 		if (res == 'c')
 		    goto cleanup;
 		if (res == 'd')
 		    goto default_case;
 		break;
+	    }
 	case '@':
 	    if (!ApplyModifier_Loop(p, &st))
 @@ -3220,27 +3220,27 @@ ApplyModifiers(char *nstr, const char *t
 	case '?':
 	    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, st.modifier == 'q');
+		st.newStr = VarQuote(st.nstr, modifier == 'q');
 		st.cp = p + 1;
 		st.termc = *st.cp;
 		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.termc = *st.cp;
 		break;
+	    }
 @@ -3316,43 +3316,43 @@ ApplyModifiers(char *nstr, const char *t
+		{
 		    Error("Unknown modifier '%c'", *p);
 		    for (st.cp = p + 1;
 			 *st.cp != ':' && *st.cp != st.endc && *st.cp != '\0';
 			 st.cp++)
 			continue;
 		    st.termc = *st.cp;
 		    st.newStr = var_Error;
+		}
+	    }
+	}
 	if (DEBUG(VAR)) {
 	    fprintf(debug_file, "Result[%s] of :%c is \"%s\"\n",
-		st.v->name, st.modifier, st.newStr);
+		st.v->name, modifier, st.newStr);
+	}
 	if (st.newStr != st.nstr) {
 	    if (*st.freePtr) {
 		free(st.nstr);
 		*st.freePtr = NULL;
+	    }
 	    st.nstr = st.newStr;
 	    if (st.nstr != var_Error && st.nstr != varNoError) {
 		*st.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, st.modifier);
+		st.endc, st.v->name, st.nstr, modifier);
 	} else if (st.termc == ':') {
 	    st.cp++;
+	}
 	p = st.cp;
+    }
 out:
     *st.lengthPtr = p - st.start;
     return st.nstr;
 bad_modifier:
     Error("Bad modifier `:%.*s' for %s",
 	  (int)strcspn(p, ":)}"), p, st.v->name);