 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.652 2020/11/02 21:34:40 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.653 2020/11/04 02:26:21 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.
 @@ -120,58 +120,53 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #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.652 2020/11/02 21:34:40 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.653 2020/11/04 02:26:21 rillig Exp $");
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
 #define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3)
 #define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
 char **savedEnv = NULL;
 /* Special return value for Var_Parse, indicating a parse error.  It may be
  * caused by an undefined variable, a syntax error in a modifier or
  * something entirely different. */
 char var_Error[] = "";
 /* Special return value for Var_Parse, indicating an undefined variable in
  * a case where VARE_UNDEFERR is not set.  This undefined variable is
  * typically a dynamic variable such as ${.TARGET}, whose expansion needs to
  * be deferred until it is defined in an actual target. */
 static char varUndefined[] = "";
 /* Special return value for Var_Parse, just to avoid allocating empty strings.
  * In contrast to var_Error and varUndefined, this is not an error marker but
  * just an ordinary successful return value. */
 static char emptyString[] = "";
 /*
  * Traditionally this make consumed $$ during := like any other expansion.
  * Other make's do not, and this make follows straight since 2016-01-09.
+ *
  * This knob allows controlling the behavior.
  * FALSE to consume $$ during := assignment.
  * TRUE to preserve $$ during := assignment.
  */
 #define MAKE_SAVE_DOLLARS ".MAKE.SAVE_DOLLARS"
 static Boolean save_dollars = TRUE;
 /*
  * Internally, variables are contained in four different contexts.
 @@ -2289,27 +2284,27 @@ ApplyModifier_ShellCommand(const char **
     const char *errfmt;
     VarParseResult res;
     (*pp)++;
     res = ParseModifierPart(pp, '!', st->eflags, st,
 			    &cmd, NULL, NULL, NULL);
     if (res != VPR_OK)
 	return AMR_CLEANUP;
     errfmt = NULL;
     if (st->eflags & VARE_WANTRES)
 	st->newVal = Cmd_Exec(cmd, &errfmt);
     else
-	st->newVal = emptyString;
+	st->newVal = bmake_strdup("");
     free(cmd);
     if (errfmt != NULL)
 	Error(errfmt, st->val);	/* XXX: why still return AMR_OK? */
     ApplyModifiersState_Define(st);
     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 **pp, ApplyModifiersState *st)
 @@ -3004,27 +2999,27 @@ ok:
 	    free(cmd_output);
 	    break;
+	}
 	case '?':
 	    if (!(st->exprFlags & VEF_UNDEF))
 		break;
 	    /* FALLTHROUGH */
 	default:
 	    Var_Set(st->v->name, val, v_ctxt);
 	    break;
+	}
+    }
     free(val);
-    st->newVal = emptyString;
+    st->newVal = bmake_strdup("");
     return AMR_OK;
+}
 /* :_=...
  * remember current value */
 static ApplyModifierResult
 ApplyModifier_Remember(const char **pp, ApplyModifiersState *st)
+{
     const char *mod = *pp;
     if (!ModMatchEq(mod, "_", st->endc))
 	return AMR_UNKNOWN;
     if (mod[1] == '=') {
 @@ -3128,27 +3123,27 @@ ApplyModifier_SysV(const char **pp, Appl
 #ifdef SUNSHCMD
 /* :sh */
 static ApplyModifierResult
 ApplyModifier_SunShell(const char **pp, ApplyModifiersState *st)
+{
     const char *p = *pp;
     if (p[1] == 'h' && (p[2] == st->endc || p[2] == ':')) {
 	if (st->eflags & VARE_WANTRES) {
 	    const char *errfmt;
 	    st->newVal = Cmd_Exec(st->val, &errfmt);
 	    if (errfmt)
 		Error(errfmt, st->val);
 	} else
-	    st->newVal = emptyString;
+	    st->newVal = bmake_strdup("");
 	*pp = p + 2;
 	return AMR_OK;
     } else
 	return AMR_UNKNOWN;
+}
 #endif
 static void
 LogBeforeApply(const ApplyModifiersState *st, const char *mod, const char endc)
+{
     char eflags_str[VarEvalFlags_ToStringSize];
     char vflags_str[VarFlags_ToStringSize];
     char exprflags_str[VarExprFlags_ToStringSize];
 @@ -3402,30 +3397,28 @@ ApplyModifiers(
 	    goto cleanup;
 	if (res == AMR_BAD)
 	    goto bad_modifier;
 	if (DEBUG(VAR))
 	    LogAfterApply(&st, p, mod);
 	if (st.newVal != st.val) {
 	    if (*out_freeIt) {
 		free(st.val);
 		*out_freeIt = NULL;
+	    }
 	    st.val = st.newVal;
-	    if (st.val != var_Error && st.val != varUndefined &&
+	    if (st.val != var_Error && st.val != varUndefined)
 		st.val != emptyString) {
 		*out_freeIt = st.val;
+	}
 	if (*p == '\0' && st.endc != '\0') {
 	    Error("Unclosed variable specification (expecting '%c') "
 		  "for \"%s\" (value \"%s\") modifier %c",
 		  st.endc, st.v->name, st.val, *mod);
 	} else if (*p == ':') {
 	    p++;
 	} else if (DEBUG(LINT) && *p != '\0' && *p != endc) {
 	    Parse_Error(PARSE_FATAL,
 			"Missing delimiter ':' after modifier \"%.*s\"",
 			(int)(p - mod), mod);
 	    /* TODO: propagate parse error to the enclosing expression */
+	}