 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.336 2020/07/26 23:03:54 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.337 2020/07/27 17:41:09 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,57 +59,57 @@
  * 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.336 2020/07/26 23:03:54 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.337 2020/07/27 17:41:09 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.336 2020/07/26 23:03:54 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.337 2020/07/27 17:41:09 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.
+ *
  *	Var_Append	    Append more characters to an existing variable
  *			    in the given context. The variable needn't
  *			    exist already -- it will be created if it doesn't.
  *			    A space is placed between the old value and the
  *			    new one.
+ *
  *	Var_Exists	    See if a variable exists.
+ *
- *	Var_Value 	    Return the value of a variable in a context or
+ *	Var_Value 	    Return the unexpanded value of a variable in a
- *			    NULL if the variable is undefined.
+ *			    context or NULL if the variable is undefined.
+ *
  *	Var_Subst 	    Substitute either a single variable or all
  *			    variables in a string, using the given context.
+ *
  *	Var_Parse 	    Parse a variable expansion from a string and
  *			    return the result and the number of characters
  *			    consumed.
+ *
  *	Var_Delete	    Delete a variable in a context.
+ *
  *	Var_Init  	    Initialize this module.
+ *
  * Debugging:
 @@ -1005,50 +1005,50 @@ Var_Exists(const char *name, GNode *ctxt
 	cp = Var_Subst(NULL, name, ctxt, VARE_WANTRES);
     v = VarFind(cp ? cp : name, ctxt, FIND_CMD | FIND_GLOBAL | FIND_ENV);
     free(cp);
     if (v == NULL)
 	return FALSE;
     (void)VarFreeEnv(v, TRUE);
     return TRUE;
+}
 /*-
  *-----------------------------------------------------------------------
  * Var_Value --
- *	Return the value of the named variable in the given context
+ *	Return the unexpanded value of the given variable in the given
  *	context.
+ *
  * Input:
  *	name		name to find
  *	ctxt		context in which to search for it
+ *
  * Results:
- *	The value if the variable exists, NULL if it doesn't
+ *	The value if the variable exists, NULL if it doesn't.
  *	If the returned value is not NULL, the caller must free *freeIt
- * Side Effects:
+ *	as soon as the returned value is no longer needed.
  *	None
  *-----------------------------------------------------------------------
  */
 char *
-Var_Value(const char *name, GNode *ctxt, char **frp)
+Var_Value(const char *name, GNode *ctxt, char **freeIt)
+{
     Var *v = VarFind(name, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
-    *frp = NULL;
+    *freeIt = NULL;
     if (v == NULL)
 	return NULL;
     char *p = Buf_GetAll(&v->val, NULL);
     if (VarFreeEnv(v, FALSE))
-	*frp = p;
+	*freeIt = p;
     return p;
+}
 /* SepBuf is a string being built from "words", interleaved with separators. */
 typedef struct {
     Buffer buf;
     Boolean needSep;
     char sep;
 } SepBuf;
 static void
 SepBuf_Init(SepBuf *buf, char sep)