Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make: do not evaluate modifiers ':M' and ':N' in parse-only mode

Browse Source 
No functional change outside debug mode (-dv for ModifyWord_Match).
This commit is contained in:
rillig 2021-03-14 19:25:05 +00:00
parent aaaf8460b3
commit ef2d559187
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.bin/make/var.c
View File

@ -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, const ApplyModifiersState *st,
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;
}