 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.758 2020/12/21 00:20:58 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.759 2020/12/21 00:30:13 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.
 @@ -121,27 +121,27 @@
 #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.758 2020/12/21 00:20:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.759 2020/12/21 00:30:13 rillig Exp $");
 typedef enum VarFlags {
 	VAR_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 	 */
 	VAR_IN_USE = 0x01,
 	/*
 	 * The variable comes from the environment.
 	 * These variables are not registered in any GNode, therefore they
 @@ -2422,27 +2422,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 = FStr_InitOwn(Cmd_Exec(cmd, &errfmt));
 	else
-		st->newVal = FStr_InitOwn(bmake_strdup(""));
+		st->newVal = FStr_InitRefer("");
 	if (errfmt != NULL)
 		Error(errfmt, cmd);	/* XXX: why still return AMR_OK? */
 	free(cmd);
 	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, const char *val, ApplyModifiersState *st)
+{
 @@ -2889,27 +2889,27 @@ ApplyModifier_Words(const char **pp, con
 	    &estr, NULL, NULL, NULL);
 	if (res != VPR_OK)
 		return AMR_CLEANUP;
 	/* now *pp points just after the closing ']' */
 	if (**pp != ':' && **pp != st->endc)
 		goto bad_modifier;	/* Found junk after ']' */
 	if (estr[0] == '\0')
 		goto bad_modifier;	/* empty square brackets in ":[]". */
 	if (estr[0] == '#' && estr[1] == '\0') { /* Found ":[#]" */
 		if (st->oneBigWord) {
-			st->newVal = FStr_InitOwn(bmake_strdup("1"));
+			st->newVal = FStr_InitRefer("1");
 		} else {
 			Buffer buf;
 			Words words = Str_Words(val, FALSE);
 			size_t ac = words.len;
 			Words_Free(words);
 			/* 3 digits + '\0' is usually enough */
 			Buf_InitSize(&buf, 4);
 			Buf_AddInt(&buf, (int)ac);
 			st->newVal = FStr_InitOwn(Buf_Destroy(&buf, FALSE));
+		}
 		goto ok;
 @@ -3167,27 +3167,27 @@ ok:
 			free(cmd_output);
 			break;
+		}
 		case '?':
 			if (!(st->exprFlags & VEF_UNDEF))
 				break;
 			/* FALLTHROUGH */
 		default:
 			Var_Set(st->var->name.str, val, ctxt);
 			break;
+		}
+	}
 	free(val);
-	st->newVal = FStr_InitOwn(bmake_strdup(""));
+	st->newVal = FStr_InitRefer("");
 	return AMR_OK;
+}
 /* :_=...
  * remember current value */
 static ApplyModifierResult
 ApplyModifier_Remember(const char **pp, const char *val,
 		       ApplyModifiersState *st)
+{
 	const char *mod = *pp;
 	if (!ModMatchEq(mod, "_", st->endc))
 		return AMR_UNKNOWN;
 @@ -3293,27 +3293,27 @@ ApplyModifier_SysV(const char **pp, cons
 /* :sh */
 static ApplyModifierResult
 ApplyModifier_SunShell(const char **pp, const char *val,
 		       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 = FStr_InitOwn(Cmd_Exec(val, &errfmt));
 			if (errfmt != NULL)
 				Error(errfmt, val);
 		} else
-			st->newVal = FStr_InitOwn(bmake_strdup(""));
+			st->newVal = FStr_InitRefer("");
 		*pp = p + 2;
 		return AMR_OK;
 	} else
 		return AMR_UNKNOWN;
+}
 #endif
 static void
 LogBeforeApply(const ApplyModifiersState *st, const char *mod, char endc,
 	       const char *val)
+{
 	char eflags_str[VarEvalFlags_ToStringSize];
 	char vflags_str[VarFlags_ToStringSize];