 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.872 2021/03/14 18:10:57 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.873 2021/03/14 18:23:44 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.
 @@ -130,27 +130,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.872 2021/03/14 18:10:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.873 2021/03/14 18:23:44 rillig Exp $");
 typedef enum VarFlags {
 	VFL_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 	 */
 	VFL_IN_USE	= 1 << 0,
 	/*
 	 * The variable comes from the environment.
 	 * These variables are not registered in any GNode, therefore they
 @@ -2601,41 +2601,45 @@ ApplyModifier_Localtime(const char **pp,
 	    VarStrftime(st->expr->value.str, FALSE, utc));
 	return AMR_OK;
+}
 /* :hash */
 static ApplyModifierResult
 ApplyModifier_Hash(const char **pp, ApplyModifiersState *st)
+{
 	if (!ModMatch(*pp, "hash", st))
 		return AMR_UNKNOWN;
 	*pp += 4;
-	Expr_SetValueOwn(st->expr, VarHash(st->expr->value.str));
+	if (st->expr->eflags & VARE_WANTRES)
 		Expr_SetValueOwn(st->expr, VarHash(st->expr->value.str));
 	return AMR_OK;
+}
 /* :P */
 static ApplyModifierResult
 ApplyModifier_Path(const char **pp, ApplyModifiersState *st)
+{
 	Expr *expr = st->expr;
 	GNode *gn;
 	char *path;
 	(*pp)++;
 	if (!(st->expr->eflags & VARE_WANTRES))
 		return AMR_OK;
 	Expr_Define(expr);
 	gn = Targ_FindNode(expr->var->name.str);
 	if (gn == NULL || gn->type & OP_NOPATH) {
 		path = NULL;
 	} else if (gn->path != NULL) {
 		path = bmake_strdup(gn->path);
 	} else {
 		SearchPath *searchPath = Suff_FindPath(gn);
 		path = Dir_FindFile(expr->var->name.str, searchPath);
+	}
 	if (path == NULL)
 		path = bmake_strdup(expr->var->name.str);
 @@ -2690,26 +2694,29 @@ ApplyModifier_Range(const char **pp, App
 		const char *p = mod + 6;
 		if (!TryParseSize(&p, &n)) {
 			Parse_Error(PARSE_FATAL,
 			    "Invalid number \"%s\" for ':range' modifier",
 			    mod + 6);
 			return AMR_CLEANUP;
+		}
 		*pp = p;
 	} else {
 		n = 0;
 		*pp = mod + 5;
+	}
 	if (!(st->expr->eflags & VARE_WANTRES))
 		return AMR_OK;
 	if (n == 0) {
 		Words words = Str_Words(st->expr->value.str, FALSE);
 		n = words.len;
 		Words_Free(words);
+	}
 	Buf_Init(&buf);
 	for (i = 0; i < n; i++) {
 		if (i != 0) {
 			/* XXX: Use st->sep instead of ' ', for consistency. */
 			Buf_AddByte(&buf, ' ');
+		}
 @@ -2939,44 +2946,53 @@ ApplyModifier_Regex(const char **pp, App
+}
 #endif
 /* :Q, :q */
 static ApplyModifierResult
 ApplyModifier_Quote(const char **pp, ApplyModifiersState *st)
+{
 	Boolean quoteDollar = **pp == 'q';
 	if (!IsDelimiter((*pp)[1], st))
 		return AMR_UNKNOWN;
 	(*pp)++;
-	Expr_SetValueOwn(st->expr, VarQuote(st->expr->value.str, quoteDollar));
+	if (st->expr->eflags & VARE_WANTRES)
 		Expr_SetValueOwn(st->expr,
 		    VarQuote(st->expr->value.str, quoteDollar));
 	return AMR_OK;
+}
 /*ARGSUSED*/
 static void
 ModifyWord_Copy(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
+{
 	SepBuf_AddStr(buf, word);
+}
 /* :ts<separator> */
 static ApplyModifierResult
 ApplyModifier_ToSep(const char **pp, ApplyModifiersState *st)
+{
 	const char *sep = *pp + 2;
 	/*
 	 * Even if VARE_WANTRES is not set, proceed as normal since there is
 	 * neither any observable side effect nor a performance penalty.
 	 * Checking for VARE_WANTRES for every single piece of code in here
 	 * would make the code in this function too hard to read.
 	 */
 	/* ":ts<any><endc>" or ":ts<any>:" */
 	if (sep[0] != st->endc && IsDelimiter(sep[1], st)) {
 		*pp = sep + 1;
 		st->sep = sep[0];
 		goto ok;
+	}
 	/* ":ts<endc>" or ":ts:" */
 	if (IsDelimiter(sep[0], st)) {
 		*pp = sep;
 		st->sep = '\0';	/* no separator */
 		goto ok;
+	}
 @@ -3079,33 +3095,35 @@ ApplyModifier_To(const char **pp, ApplyM
 	if (!IsDelimiter(mod[2], st)) {			/* :t<unrecognized> */
 		*pp = mod + 1;
 		return AMR_BAD;
+	}
 	if (mod[1] == 'A') {				/* :tA */
 		*pp = mod + 2;
 		ModifyWords(st, ModifyWord_Realpath, NULL, st->oneBigWord);
 		return AMR_OK;
+	}
 	if (mod[1] == 'u') {				/* :tu */
 		*pp = mod + 2;
-		Expr_SetValueOwn(expr, str_toupper(expr->value.str));
+		if (st->expr->eflags & VARE_WANTRES)
 			Expr_SetValueOwn(expr, str_toupper(expr->value.str));
 		return AMR_OK;
+	}
 	if (mod[1] == 'l') {				/* :tl */
 		*pp = mod + 2;
-		Expr_SetValueOwn(expr, str_tolower(expr->value.str));
+		if (st->expr->eflags & VARE_WANTRES)
 			Expr_SetValueOwn(expr, str_tolower(expr->value.str));
 		return AMR_OK;
+	}
 	if (mod[1] == 'W' || mod[1] == 'w') {		/* :tW, :tw */
 		*pp = mod + 2;
 		st->oneBigWord = mod[1] == 'W';
 		return AMR_OK;
+	}
 	/* Found ":t<unrecognised>:" or ":t<unrecognised><endc>". */
 	*pp = mod + 1;		/* XXX: unnecessary but observable */
 	return AMR_BAD;
+}
 @@ -3454,39 +3472,41 @@ ApplyModifier_Remember(const char **pp,
 /*
  * Apply the given function to each word of the variable value,
  * for a single-letter modifier such as :H, :T.
  */
 static ApplyModifierResult
 ApplyModifier_WordFunc(const char **pp, ApplyModifiersState *st,
 		       ModifyWordProc modifyWord)
+{
 	if (!IsDelimiter((*pp)[1], st))
 		return AMR_UNKNOWN;
 	(*pp)++;
-	ModifyWords(st, modifyWord, NULL, st->oneBigWord);
+	if (st->expr->eflags & VARE_WANTRES)
 		ModifyWords(st, modifyWord, NULL, st->oneBigWord);
 	return AMR_OK;
+}
 static ApplyModifierResult
 ApplyModifier_Unique(const char **pp, ApplyModifiersState *st)
+{
 	if (!IsDelimiter((*pp)[1], st))
 		return AMR_UNKNOWN;
 	(*pp)++;
-	Expr_SetValueOwn(st->expr, VarUniq(st->expr->value.str));
+	if (st->expr->eflags & VARE_WANTRES)
 		Expr_SetValueOwn(st->expr, VarUniq(st->expr->value.str));
 	return AMR_OK;
+}
 #ifdef SYSVVARSUB
 /* :from=to */
 static ApplyModifierResult
 ApplyModifier_SysV(const char **pp, ApplyModifiersState *st)
+{
 	Expr *expr = st->expr;
 	char *lhs, *rhs;
 	VarParseResult res;