diff options
| author | rillig <rillig@NetBSD.org> | 2021-03-14 17:34:50 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2021-03-14 17:34:50 +0000 |
| commit | a0a0f8bbea8904fb239bc82e30f337a50a77fb2c (patch) | |
| tree | 276f92508ff364eb325825e231ec7c91d81ee8ef /usr.bin/make | |
| parent | 09400da20bbc0536aa811be52bf12fa48de32ee6 (diff) | |
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.
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/var.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index 479499e26c2..35707e89e2f 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -1,4 +1,4 @@ -/* $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 @@ -140,7 +140,7 @@ #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, @@ -3418,10 +3418,12 @@ 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 @@ -3430,18 +3432,14 @@ ApplyModifier_Remember(const char **pp, ApplyModifiersState *st) */ size_t n = strcspn(mod + 2, ":)}"); *pp = mod + 2 + n; - - if (expr->eflags & VARE_WANTRES) { - char *name = bmake_strldup(mod + 2, n); - Var_Set(expr->scope, name, expr->value.str); - free(name); - } - } else { + name = FStr_InitOwn(bmake_strldup(mod + 2, n)); + } else *pp = mod + 1; - if (expr->eflags & VARE_WANTRES) - Var_Set(expr->scope, "_", expr->value.str); - } + if (expr->eflags & VARE_WANTRES) + Var_Set(expr->scope, name.str, expr->value.str); + FStr_Done(&name); + return AMR_OK; } |
