Sun Mar 14 17:34:50 2021 UTC ()

make: merge duplicate code in ApplyModifier_Remember

This way, parsing and evaluating the modifier is only written once in
the code.  The downside is that the variable name is allocated even if
VARE_WANTRES is not set, but since this modifier is so obscure and
seldom used this doesn't matter in practice.


(rillig)

diff -r1.867 -r1.868 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2021/03/14 17:27:27	1.867
+++ src/usr.bin/make/var.c 2021/03/14 17:34:50	1.868

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.867 2021/03/14 17:27:27 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.868 2021/03/14 17:34:50 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.867 2021/03/14 17:27:27 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.868 2021/03/14 17:34:50 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
 @@ -3408,50 +3408,48 @@ ok:
 	Expr_SetValueRefer(expr, "");
 	return AMR_OK;
+}
 /*
  * :_=...
  * remember current value
  */
 static ApplyModifierResult
 ApplyModifier_Remember(const char **pp, ApplyModifiersState *st)
+{
 	Expr *expr = st->expr;
 	const char *mod = *pp;
 	FStr name;
 	if (!ModMatchEq(mod, "_", st))
 		return AMR_UNKNOWN;
 	name = FStr_InitRefer("_");
 	if (mod[1] == '=') {
 		/*
 		 * XXX: This ad-hoc call to strcspn deviates from the usual
 		 * behavior defined in ParseModifierPart.  This creates an
 		 * unnecessary, undocumented inconsistency in make.
 		 */
 		size_t n = strcspn(mod + 2, ":)}");
 		*pp = mod + 2 + n;
 		name = FStr_InitOwn(bmake_strldup(mod + 2, n));
-		if (expr->eflags & VARE_WANTRES) {
+	} else
 			char *name = bmake_strldup(mod + 2, n);
 			Var_Set(expr->scope, name, expr->value.str);
 			free(name);
 	} else {
 		*pp = mod + 1;
-		if (expr->eflags & VARE_WANTRES)
+	if (expr->eflags & VARE_WANTRES)
-			Var_Set(expr->scope, "_", expr->value.str);
+		Var_Set(expr->scope, name.str, expr->value.str);
 	FStr_Done(&name);
 	return AMR_OK;
+}
 /*
  * 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;