 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.334 2020/07/26 22:19:11 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.335 2020/07/26 22:43:16 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.334 2020/07/26 22:19:11 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.335 2020/07/26 22:43:16 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.334 2020/07/26 22:19:11 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.335 2020/07/26 22:43:16 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.
+ *
 @@ -3348,26 +3348,65 @@ bad_modifier:
     Error("Bad modifier `:%.*s' for %s",
 	  (int)strcspn(p, ":)}"), p, st.v->name);
 cleanup:
     *st.lengthPtr = st.cp - st.start;
     if (st.missing_delim != '\0')
 	Error("Unclosed substitution for %s (%c missing)",
 	      st.v->name, st.missing_delim);
     free(*st.freePtr);
     *st.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'))) &&
 	(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 (varname[0]) {
 	case '@':
 	case '%':
 	case '*':
 	case '!':
 	    return TRUE;
+	}
 	return FALSE;
+    }
     if (namelen > 2 && varname[0] == '.' &&
 	isupper((unsigned char) varname[1]) &&
 	(ctxt == VAR_CMD || ctxt == VAR_GLOBAL))
+    {
 	return strcmp(varname, ".TARGET") == 0 ||
 	    strcmp(varname, ".ARCHIVE") == 0 ||
 	    strcmp(varname, ".PREFIX") == 0 ||
 	    strcmp(varname, ".MEMBER") == 0;
+    }
     return FALSE;
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Parse --
  *	Given the start of a variable invocation (such as $v, $(VAR),
  *	${VAR:Mpattern}), extract the variable name, possibly some
  *	modifiers and find its value by applying the modifiers to the
  *	original value.
+ *
  * Input:
  *	str		The string to parse
  *	ctxt		The context for the variable
  *	flags		VARE_UNDEFERR	if undefineds are an error
  *			VARE_WANTRES	if we actually want the result
 @@ -3532,59 +3571,27 @@ Var_Parse(const char * const str, GNode
 	    char name[] = {varname[0], '\0' };
 	    v = VarFind(name, ctxt, 0);
 	    if (v != NULL) {
 		if (varname[1] == 'D') {
 		    extramodifiers = "H:";
 		} else { /* F */
 		    extramodifiers = "T:";
+		}
+	    }
+	}
 	if (v == NULL) {
-	    if ((namelen == 1 ||
+	    dynamic = VarIsDynamic(ctxt, varname, namelen);
 		 (namelen == 2 && (varname[1] == 'F' || varname[1] == 'D'))) &&
 		(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 (varname[0]) {
 		case '@':
 		case '%':
 		case '*':
 		case '!':
 		    dynamic = TRUE;
 		    break;
 	    } else if (namelen > 2 && varname[0] == '.' &&
 		       isupper((unsigned char) varname[1]) &&
 		       (ctxt == VAR_CMD || ctxt == VAR_GLOBAL))
 		if ((strcmp(varname, ".TARGET") == 0) ||
 		    (strcmp(varname, ".ARCHIVE") == 0) ||
 		    (strcmp(varname, ".PREFIX") == 0) ||
 		    (strcmp(varname, ".MEMBER") == 0))
 		    dynamic = TRUE;
 	    if (!haveModifier) {
 		/*
 		 * No modifiers -- have specification length so we can return
 		 * now.
 		 */
 		*lengthPtr = tstr - str + 1;
 		if (dynamic) {
 		    char *pstr = bmake_strndup(str, *lengthPtr);
 		    *freePtr = pstr;
 		    Buf_Destroy(&namebuf, TRUE);
 		    return pstr;
 		} else {