 @@ -1,14 +1,14 @@
-/*	$NetBSD: nonints.h,v 1.103 2020/09/03 16:02:02 rillig Exp $	*/
+/*	$NetBSD: nonints.h,v 1.104 2020/09/03 18:19:15 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.
 @@ -204,24 +204,25 @@ typedef enum {
     /* Make the variable read-only. No further modification is possible,
      * except for another call to Var_Set with the same flag. */
     VAR_SET_READONLY	= 0x02
 } VarSet_Flags;
 void Var_Delete(const char *, GNode *);
 void Var_Set(const char *, const char *, GNode *);
 void Var_Set_with_flags(const char *, const char *, GNode *, VarSet_Flags);
 void Var_Append(const char *, const char *, GNode *);
 Boolean Var_Exists(const char *, GNode *);
 const char *Var_Value(const char *, GNode *, char **);
 const char *Var_Parse(const char *, GNode *, VarEvalFlags, int *, void **);
 const char *Var_ParsePP(const char **, GNode *, VarEvalFlags, void **);
 char *Var_Subst(const char *, GNode *, VarEvalFlags);
 void Var_Init(void);
 void Var_End(void);
 void Var_Stats(void);
 void Var_Dump(GNode *);
 void Var_ExportVars(void);
 void Var_Export(const char *, Boolean);
 void Var_UnExport(const char *);
 /* util.c */
 void (*bmake_signal(int, void (*)(int)))(int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.484 2020/09/02 06:25:48 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.485 2020/09/03 18:19:15 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.484 2020/09/02 06:25:48 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.485 2020/09/03 18:19:15 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.484 2020/09/02 06:25:48 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.485 2020/09/03 18:19:15 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.
+ *
 @@ -1669,35 +1669,36 @@ ParseModifierPart(
 	    continue;
+	}
 	if (p[1] == delim) {	/* Unescaped $ at end of pattern */
 	    if (out_pflags != NULL)
 		*out_pflags |= VARP_ANCHOR_END;
 	    else
 		Buf_AddByte(&buf, *p);
 	    p++;
 	    continue;
+	}
 	if (eflags & VARE_WANTRES) {	/* Nested variable, evaluated */
-	    const char *cp2;
+	    const char *nested_p = p;
-	    int len;
+	    const char *nested_val;
-	    void *freeIt;
+	    void *nested_val_freeIt;
 	    VarEvalFlags nested_eflags = eflags & ~(unsigned)VARE_ASSIGN;
-	    cp2 = Var_Parse(p, ctxt, nested_eflags, &len, &freeIt);
+	    nested_val = Var_ParsePP(&nested_p, ctxt, nested_eflags,
-	    Buf_AddStr(&buf, cp2);
+				     &nested_val_freeIt);
-	    free(freeIt);
+	    Buf_AddStr(&buf, nested_val);
-	    p += len;
+	    free(nested_val_freeIt);
 	    p += nested_p - p;
 	    continue;
+	}
 	/* XXX: This whole block is very similar to Var_Parse without
 	 * VARE_WANTRES.  There may be subtle edge cases though that are
 	 * not yet covered in the unit tests and that are parsed differently,
 	 * depending on whether they are evaluated or not.
+	 *
 	 * This subtle difference is not documented in the manual page,
 	 * neither is the difference between parsing :D and :M documented.
 	 * No code should ever depend on these details, but who knows. */
 	varstart = p;		/* Nested variable, only parsed */
 @@ -3614,26 +3615,35 @@ Var_Parse(const char * const str, GNode
 		*freePtr = nstr;
 	    } else {
 		nstr = (eflags & VARE_UNDEFERR) ? var_Error : varNoError;
+	    }
+	}
 	if (nstr != Buf_GetAll(&v->val, NULL))
 	    Buf_Destroy(&v->val, TRUE);
 	free(v->name);
 	free(v);
+    }
     return nstr;
+}
 const char *
 Var_ParsePP(const char **pp, GNode *ctxt, VarEvalFlags eflags, void **freePtr)
+{
     int len;
     const char *val = Var_Parse(*pp, ctxt, eflags, &len, freePtr);
     *pp += len;
     return val;
+}
 /* Substitute for all variables in the given string in the given context.
+ *
  * If eflags & VARE_UNDEFERR, Parse_Error will be called when an undefined
  * variable is encountered.
+ *
  * If eflags & VARE_WANTRES, any effects from the modifiers, such as ::=,
  * :sh or !cmd! take place.
+ *
  * 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