 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.349 2020/07/27 23:37:37 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.350 2020/07/27 23:56: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.349 2020/07/27 23:37:37 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.350 2020/07/27 23:56: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.349 2020/07/27 23:37:37 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.350 2020/07/27 23:56: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.
+ *
 @@ -2026,50 +2026,56 @@ VarStrftime(const char *fmt, int zulu, t
+{
     char buf[BUFSIZ];
     if (!utc)
 	time(&utc);
     if (!*fmt)
 	fmt = "%c";
     strftime(buf, sizeof(buf), fmt, zulu ? gmtime(&utc) : localtime(&utc));
     buf[sizeof(buf) - 1] = '\0';
     return bmake_strdup(buf);
+}
 /* The ApplyModifier functions all work in the same way.
  * They parse the modifier (often until the next colon) and store the
  * updated position for the parser into st->next.
  * They take the st->val and generate st->newVal from it.
  * On success, they set st->termc to *st->next, redundantly.
  * On failure, many of them update st->missing_delim.
  */
 typedef struct {
     /* const parameters */
     int startc;			/* '\0' or '{' or '(' */
     int endc;
     Var *v;
     GNode *ctxt;
     VarEvalFlags eflags;
-    /* read-write */
+    char *val;			/* The value of the expression before the
-    char *val;
+				 * modifier is applied */
     char *newVal;		/* The new value after applying the modifier
 				 * to the expression */
     const char *next;		/* The position where parsing continues
 				 * after the current modifier. */
     char termc;			/* Character which terminated scan */
     char missing_delim;		/* For error reporting */
     Byte	sep;		/* Word separator in expansions */
     Boolean	oneBigWord;	/* TRUE if we will treat the variable as a
 				 * single big word, even if it contains
 				 * embedded spaces (as opposed to the
 				 * usual behaviour of treating it as
 				 * several space-separated words). */
     /* result */
     char *newVal;		/* New value to return */
 } ApplyModifiersState;
 /* we now have some modifiers with long names */
 static Boolean
 ModMatch(const char *mod, const char *modname, char endc)
+{
     size_t n = strlen(modname);
     return strncmp(mod, modname, n) == 0 &&
 	   (mod[n] == endc || mod[n] == ':');
+}
 static inline Boolean
 ModMatchEq(const char *mod, const char *modname, char endc)
 @@ -3060,27 +3066,27 @@ ApplyModifier_SysV(const char *mod, Appl
  *			the form '${x:P}'.
  *	  :!<cmd>!	Run cmd much the same as :sh run's the
  *			current value of the variable.
  * Assignment operators (see ApplyModifier_Assign).
  */
 static char *
 ApplyModifiers(char *val, const char * const tstr,
 	       int const startc, int const endc,
 	       Var * const v, GNode * const ctxt, VarEvalFlags const eflags,
 	       int * const lengthPtr, void ** const freePtr)
+{
     ApplyModifiersState st = {
 	startc, endc, v, ctxt, eflags,
-	val, tstr, '\0', '\0', ' ', FALSE, NULL
+	val, NULL, NULL, '\0', '\0', ' ', FALSE
     };
     const char *p = tstr;
     while (*p != '\0' && *p != endc) {
 	if (*p == '$') {
 	    /*
 	     * We may have some complex modifiers in a variable.
 	     */
 	    void *freeIt;
 	    const char *rval;
 	    int rlen;
 	    int c;