 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.324 2020/07/26 18:47:02 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.325 2020/07/26 19:11:06 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.324 2020/07/26 18:47:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.325 2020/07/26 19:11:06 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.324 2020/07/26 18:47:02 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.325 2020/07/26 19:11:06 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.
+ *
 @@ -3442,27 +3442,27 @@ Var_Parse(const char *str, GNode *ctxt,
 		case '@':
 		    return UNCONST("$(.TARGET)");
 		case '%':
 		    return UNCONST("$(.MEMBER)");
 		case '*':
 		    return UNCONST("$(.PREFIX)");
 		case '!':
 		    return UNCONST("$(.ARCHIVE)");
+		}
+	    }
 	    return (flags & VARE_UNDEFERR) ? var_Error : varNoError;
 	} else {
 	    haveModifier = FALSE;
-	    tstr = &str[1];
+	    tstr = str + 1;
 	    endc = str[1];
+	}
     } else {
 	Buffer buf;		/* Holds the variable name */
 	int depth = 1;
 	endc = startc == PROPEN ? PRCLOSE : BRCLOSE;
 	Buf_Init(&buf, 0);
 	/*
 	 * Skip to the end character or a colon, whichever comes first.
 	 */
 	for (tstr = str + 2; *tstr != '\0'; tstr++) {
 @@ -3491,121 +3491,122 @@ Var_Parse(const char *str, GNode *ctxt,
 	    haveModifier = TRUE;
 	} else if (*tstr == endc) {
 	    haveModifier = FALSE;
 	} else {
 	    /*
 	     * If we never did find the end character, return NULL
 	     * right now, setting the length to be the distance to
 	     * the end of the string, since that's what make does.
 	     */
 	    *lengthPtr = tstr - str;
 	    Buf_Destroy(&buf, TRUE);
 	    return var_Error;
+	}
 	str = Buf_GetAll(&buf, &vlen);
 	char *varname = Buf_GetAll(&buf, &vlen);
 	/*
-	 * At this point, str points into newly allocated memory from
+	 * At this point, varname points into newly allocated memory from
 	 * buf, containing only the name of the variable.
+	 *
 	 * start and tstr point into the const string that was pointed
 	 * to by the original value of the str parameter.  start points
 	 * to the '$' at the beginning of the string, while tstr points
 	 * to the char just after the end of the variable name -- this
 	 * will be '\0', ':', PRCLOSE, or BRCLOSE.
 	 */
-	v = VarFind(str, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
+	v = VarFind(varname, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
 	/*
 	 * Check also for bogus D and F forms of local variables since we're
 	 * in a local context and the name is the right length.
 	 */
-	if ((v == NULL) && (ctxt != VAR_CMD) && (ctxt != VAR_GLOBAL) &&
+	if (v == NULL && ctxt != VAR_CMD && ctxt != VAR_GLOBAL &&
-		(vlen == 2) && (str[1] == 'F' || str[1] == 'D') &&
+		vlen == 2 && (varname[1] == 'F' || varname[1] == 'D') &&
-		strchr("@%?*!<>", str[0]) != NULL) {
+		strchr("@%?*!<>", varname[0]) != NULL) {
 	    /*
 	     * Well, it's local -- go look for it.
 	     */
-	    name[0] = *str;
+	    name[0] = varname[0];
 	    name[1] = '\0';
 	    v = VarFind(name, ctxt, 0);
 	    if (v != NULL) {
-		if (str[1] == 'D') {
+		if (varname[1] == 'D') {
 		    extramodifiers = "H:";
 		} else { /* F */
 		    extramodifiers = "T:";
+		}
+	    }
+	}
 	if (v == NULL) {
-	    if (((vlen == 1) ||
+	    if ((vlen == 1 ||
-		 (((vlen == 2) && (str[1] == 'F' || str[1] == 'D')))) &&
+		 ((vlen == 2 && (varname[1] == 'F' || varname[1] == 'D')))) &&
-		((ctxt == VAR_CMD) || (ctxt == VAR_GLOBAL)))
+		(ctxt == VAR_CMD || ctxt == VAR_GLOBAL))
+	    {
 		/*
 		 * If substituting a local variable in a non-local context,
 		 * assume it's for dynamic source stuff. We have to handle
 		 * this specially and return the longhand for the variable
 		 * with the dollar sign escaped so it makes it back to the
 		 * caller. Only four of the local variables are treated
 		 * specially as they are the only four that will be set
 		 * when dynamic sources are expanded.
 		 */
-		switch (*str) {
+		switch (varname[0]) {
 		case '@':
 		case '%':
 		case '*':
 		case '!':
 		    dynamic = TRUE;
 		    break;
+		}
-	    } else if (vlen > 2 && *str == '.' &&
+	    } else if (vlen > 2 && varname[0] == '.' &&
-		       isupper((unsigned char) str[1]) &&
+		       isupper((unsigned char) varname[1]) &&
 		       (ctxt == VAR_CMD || ctxt == VAR_GLOBAL))
+	    {
 		int len = vlen - 1;
-		if ((strncmp(str, ".TARGET", len) == 0) ||
+		if ((strncmp(varname, ".TARGET", len) == 0) ||
-		    (strncmp(str, ".ARCHIVE", len) == 0) ||
+		    (strncmp(varname, ".ARCHIVE", len) == 0) ||
-		    (strncmp(str, ".PREFIX", len) == 0) ||
+		    (strncmp(varname, ".PREFIX", len) == 0) ||
-		    (strncmp(str, ".MEMBER", len) == 0))
+		    (strncmp(varname, ".MEMBER", len) == 0))
+		{
 		    dynamic = TRUE;
+		}
+	    }
 	    if (!haveModifier) {
 		/*
 		 * No modifiers -- have specification length so we can return
 		 * now.
 		 */
 		*lengthPtr = tstr - start + 1;
 		if (dynamic) {
 		    char *pstr = bmake_strndup(start, *lengthPtr);
 		    *freePtr = pstr;
 		    Buf_Destroy(&buf, TRUE);
 		    return pstr;
 		} else {
 		    Buf_Destroy(&buf, TRUE);
 		    return (flags & VARE_UNDEFERR) ? var_Error : varNoError;
+		}
 	    } else {
 		/*
 		 * Still need to get to the end of the variable specification,
 		 * so kludge up a Var structure for the modifications
 		 */
 		v = bmake_malloc(sizeof(Var));
-		v->name = UNCONST(str);
+		v->name = varname;
 		Buf_Init(&v->val, 1);
 		v->flags = VAR_JUNK;
 		Buf_Destroy(&buf, FALSE);
+	    }
 	} else
 	    Buf_Destroy(&buf, TRUE);
+    }
     if (v->flags & VAR_IN_USE) {
 	Fatal("Variable %s is recursive.", v->name);
 	/*NOTREACHED*/
     } else {
 	v->flags |= VAR_IN_USE;
 @@ -3658,27 +3659,27 @@ Var_Parse(const char *str, GNode *ctxt,
 	    destroy = TRUE;
 	} else {
 	    /*
 	     * Returning the value unmodified, so tell the caller to free
 	     * the thing.
 	     */
 	    *freePtr = nstr;
+	}
 	VarFreeEnv(v, destroy);
     } else if (v->flags & VAR_JUNK) {
 	/*
 	 * Perform any free'ing needed and set *freePtr to NULL so the caller
 	 * doesn't try to free a static pointer.
-	 * If VAR_KEEP is also set then we want to keep str as is.
+	 * If VAR_KEEP is also set then we want to keep str(?) as is.
 	 */
 	if (!(v->flags & VAR_KEEP)) {
 	    if (*freePtr) {
 		free(nstr);
 		*freePtr = NULL;
+	    }
 	    if (dynamic) {
 		nstr = bmake_strndup(start, *lengthPtr);
 		*freePtr = nstr;
 	    } else {
 		nstr = (flags & VARE_UNDEFERR) ? var_Error : varNoError;
+	    }
+	}