Module Name: src
Committed By: rillig
Date: Sun Mar 14 19:25:05 UTC 2021
Modified Files:
src/usr.bin/make: var.c
Log Message:
make: do not evaluate modifiers ':M' and ':N' in parse-only mode
No functional change outside debug mode (-dv for ModifyWord_Match).
To generate a diff of this commit:
cvs rdiff -u -r1.875 -r1.876 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.875 src/usr.bin/make/var.c:1.876
--- src/usr.bin/make/var.c:1.875 Sun Mar 14 19:21:28 2021
+++ src/usr.bin/make/var.c Sun Mar 14 19:25:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.875 2021/03/14 19:21:28 rillig Exp $ */
+/* $NetBSD: var.c,v 1.876 2021/03/14 19:25:05 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.875 2021/03/14 19:21:28 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.876 2021/03/14 19:25:05 rillig Exp $");
typedef enum VarFlags {
VFL_NONE = 0,
@@ -2811,14 +2811,17 @@ ParseModifier_Match(const char **pp, con
static ApplyModifierResult
ApplyModifier_Match(const char **pp, ApplyModifiersState *st)
{
- const char *mod = *pp;
+ const char mod = **pp;
char *pattern;
- ModifyWordProc modifyWord;
ParseModifier_Match(pp, st, &pattern);
- modifyWord = mod[0] == 'M' ? ModifyWord_Match : ModifyWord_NoMatch;
- ModifyWords(st, modifyWord, pattern, st->oneBigWord);
+ if (st->expr->eflags & VARE_WANTRES) {
+ ModifyWordProc modifyWord =
+ mod == 'M' ? ModifyWord_Match : ModifyWord_NoMatch;
+ ModifyWords(st, modifyWord, pattern, st->oneBigWord);
+ }
+
free(pattern);
return AMR_OK;
}
