 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.405 2020/08/02 19:49:17 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.406 2020/08/02 19:59:17 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.405 2020/08/02 19:49:17 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.406 2020/08/02 19:59:17 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.405 2020/08/02 19:49:17 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.406 2020/08/02 19:59:17 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.
+ *
 @@ -2051,53 +2051,53 @@ ApplyModifier_Hash(const char *mod, Appl
 static ApplyModifierResult
 ApplyModifier_Path(const char *mod, ApplyModifiersState *st)
+{
     if (st->v->flags & VAR_JUNK)
 	st->v->flags |= VAR_KEEP;
     GNode *gn = Targ_FindNode(st->v->name, TARG_NOCREATE);
     if (gn == NULL || gn->type & OP_NOPATH) {
 	st->newVal = NULL;
     } else if (gn->path) {
 	st->newVal = bmake_strdup(gn->path);
     } else {
 	st->newVal = Dir_FindFile(st->v->name, Suff_FindPath(gn));
+    }
-    if (!st->newVal)
+    if (st->newVal == NULL)
 	st->newVal = bmake_strdup(st->v->name);
     st->next = mod + 1;
     return AMR_OK;
+}
 /* :!cmd! */
 static ApplyModifierResult
 ApplyModifier_Exclam(const char *mod, ApplyModifiersState *st)
+{
     st->next = mod + 1;
     char delim = '!';
     char *cmd = ParseModifierPart(&st->next, delim, st->eflags, st->ctxt,
 				  NULL, NULL, NULL);
     if (cmd == NULL) {
 	st->missing_delim = delim;
 	return AMR_CLEANUP;
+    }
     const char *emsg = NULL;
     if (st->eflags & VARE_WANTRES)
 	st->newVal = Cmd_Exec(cmd, &emsg);
     else
 	st->newVal = varNoError;
     free(cmd);
-    if (emsg)
+    if (emsg != NULL)
 	Error(emsg, st->val);	/* XXX: why still return AMR_OK? */
     if (st->v->flags & VAR_JUNK)
 	st->v->flags |= VAR_KEEP;
     return AMR_OK;
+}
 /* The :range modifier generates an integer sequence as long as the words.
  * The :range=7 modifier generates an integer sequence from 1 to 7. */
 static ApplyModifierResult
 ApplyModifier_Range(const char *mod, ApplyModifiersState *st)
+{
     if (!ModMatchEq(mod, "range", st->endc))
 @@ -2739,32 +2739,32 @@ ApplyModifier_Assign(const char *mod, Ap
 	st->missing_delim = delim;
 	return AMR_CLEANUP;
+    }
     st->next--;
     if (st->eflags & VARE_WANTRES) {
 	switch (op[0]) {
 	case '+':
 	    Var_Append(st->v->name, val, v_ctxt);
 	    break;
 	case '!': {
 	    const char *emsg;
-	    st->newVal = Cmd_Exec(val, &emsg);
+	    char *cmd_output = Cmd_Exec(val, &emsg);
 	    if (emsg)
 		Error(emsg, st->val);
 	    else
-		Var_Set(st->v->name, st->newVal, v_ctxt);
+		Var_Set(st->v->name, cmd_output, v_ctxt);
-	    free(st->newVal);
+	    free(cmd_output);
 	    break;
+	}
 	case '?':
 	    if (!(st->v->flags & VAR_JUNK))
 		break;
 	    /* FALLTHROUGH */
 	default:
 	    Var_Set(st->v->name, val, v_ctxt);
 	    break;
+	}
+    }
     free(val);
     st->newVal = varNoError;
 @@ -3582,27 +3582,27 @@ Var_Subst(const char *str, GNode *ctxt,
 	    str += 2;
 	} else if (*str != '$') {
 	    /*
 	     * Skip as many characters as possible -- either to the end of
 	     * the string or to the next dollar sign (variable invocation).
 	     */
 	    const char *cp;
 	    for (cp = str++; *str != '$' && *str != '\0'; str++)
 		continue;
 	    Buf_AddBytesBetween(&buf, cp, str);
 	} else {
 	    int length;
-	    void *freeIt = NULL;
+	    void *freeIt;
 	    const char *val = Var_Parse(str, ctxt, eflags, &length, &freeIt);
 	    /*
 	     * When we come down here, val should either point to the
 	     * value of this variable, suitably modified, or be NULL.
 	     * Length should be the total length of the potential
 	     * variable invocation (from $ to end character...)
 	     */
 	    if (val == var_Error || val == varNoError) {
 		/*
 		 * 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