 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.536 2020/09/23 07:50:58 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.537 2020/09/25 05:04:51 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.
 @@ -111,27 +111,27 @@
 #include    <sys/types.h>
 #include    <regex.h>
 #endif
 #include    <inttypes.h>
 #include    <limits.h>
 #include    <time.h>
 #include    "make.h"
 #include    "dir.h"
 #include    "job.h"
 #include    "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.536 2020/09/23 07:50:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.537 2020/09/25 05:04:51 rillig Exp $");
 #define VAR_DEBUG_IF(cond, fmt, ...)	\
     if (!(DEBUG(VAR) && (cond)))	\
 	(void) 0;			\
     else				\
 	fprintf(debug_file, fmt, __VA_ARGS__)
 #define VAR_DEBUG(fmt, ...) VAR_DEBUG_IF(TRUE, fmt, __VA_ARGS__)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
 @@ -3710,90 +3710,91 @@ Var_Parse(const char **pp, GNode *ctxt,
  * Input:
  *	str		the string which to substitute
  *	ctxt		the context wherein to find variables
  *	eflags		VARE_UNDEFERR	if undefineds are an error
  *			VARE_WANTRES	if we actually want the result
  *			VARE_ASSIGN	if we are in a := assignment
+ *
  * Results:
  *	The resulting string.
  */
 VarParseResult
 Var_Subst(const char *str, GNode *ctxt, VarEvalFlags eflags, char **out_res)
+{
     const char *p = str;
     Buffer buf;			/* Buffer for forming things */
     /* Set true if an error has already been reported,
      * to prevent a plethora of messages when recursing */
     static Boolean errorReported;
     Buf_Init(&buf, 0);
     errorReported = FALSE;
-    while (*str) {
+    while (*p != '\0') {
-	if (*str == '$' && str[1] == '$') {
+	if (p[0] == '$' && p[1] == '$') {
 	    /*
 	     * A dollar sign may be escaped with another dollar sign.
 	     * In such a case, we skip over the escape character and store the
 	     * dollar sign into the buffer directly.
 	     */
 	    if (save_dollars && (eflags & VARE_ASSIGN))
 		Buf_AddByte(&buf, '$');
 	    Buf_AddByte(&buf, '$');
-	    str += 2;
+	    p += 2;
-	} else if (*str != '$') {
+	} else if (*p != '$') {
 	    /*
 	     * Skip as many characters as possible -- either to the end of
 	     * the string or to the next dollar sign (variable expression).
 	     */
-	    const char *cp;
+	    const char *plainStart = p;
-	    for (cp = str++; *str != '$' && *str != '\0'; str++)
+	    for (p++; *p != '$' && *p != '\0'; p++)
 		continue;
-	    Buf_AddBytesBetween(&buf, cp, str);
+	    Buf_AddBytesBetween(&buf, plainStart, p);
 	} else {
-	    const char *nested_str = str;
+	    const char *nested_p = p;
 	    void *freeIt;
 	    const char *val;
-	    (void)Var_Parse(&nested_str, ctxt, eflags, &val, &freeIt);
+	    (void)Var_Parse(&nested_p, ctxt, eflags, &val, &freeIt);
 	    /* TODO: handle errors */
 	    if (val == var_Error || val == varUndefined) {
 		/*
 		 * If performing old-time variable substitution, skip over
 		 * the variable and continue with the substitution. Otherwise,
 		 * store the dollar sign and advance str so we continue with
 		 * the string...
 		 */
 		if (oldVars) {
-		    str = nested_str;
+		    p = nested_p;
 		} else if ((eflags & VARE_UNDEFERR) || val == var_Error) {
 		    /*
 		     * If variable is undefined, complain and skip the
 		     * variable. The complaint will stop us from doing anything
 		     * when the file is parsed.
 		     */
 		    if (!errorReported) {
 			Parse_Error(PARSE_FATAL, "Undefined variable \"%.*s\"",
-				    (int)(size_t)(nested_str - str), str);
+				    (int)(size_t)(nested_p - p), p);
+		    }
-		    str = nested_str;
+		    p = nested_p;
 		    errorReported = TRUE;
 		} else {
-		    Buf_AddByte(&buf, *str);
+		    Buf_AddByte(&buf, *p);
-		    str++;
+		    p++;
+		}
 	    } else {
-		str = nested_str;
+		p = nested_p;
 		Buf_AddStr(&buf, val);
+	    }
 	    free(freeIt);
 	    freeIt = NULL;
+	}
+    }
     *out_res = Buf_DestroyCompact(&buf);
     return VPR_OK;
+}
 /* Initialize the module. */
 void