Module Name: src Committed By: rillig Date: Thu Nov 5 18:26:59 UTC 2020
Modified Files: src/usr.bin/make: var.c Log Message: make(1): replace '(' and ')' with neutral '\0' in Var_Parse The only possible values for extramodifiers are "H:" and "T:", therefore parsing is independent of startc and endc. Use '\0' instead of '(' and ')' to remove any possible confusion about how '{' and '}' would be handled. To generate a diff of this commit: cvs rdiff -u -r1.660 -r1.661 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.660 src/usr.bin/make/var.c:1.661 --- src/usr.bin/make/var.c:1.660 Thu Nov 5 18:20:23 2020 +++ src/usr.bin/make/var.c Thu Nov 5 18:26:59 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.660 2020/11/05 18:20:23 rillig Exp $ */ +/* $NetBSD: var.c,v 1.661 2020/11/05 18:26:59 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -130,7 +130,7 @@ #include "metachar.h" /* "@(#)var.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: var.c,v 1.660 2020/11/05 18:20:23 rillig Exp $"); +MAKE_RCSID("$NetBSD: var.c,v 1.661 2020/11/05 18:26:59 rillig Exp $"); #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1) #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2) @@ -3882,7 +3882,7 @@ Var_Parse(const char **pp, GNode *ctxt, extraFree = NULL; if (extramodifiers != NULL) { const char *em = extramodifiers; - nstr = ApplyModifiers(&em, nstr, '(', ')', + nstr = ApplyModifiers(&em, nstr, '\0', '\0', v, &exprFlags, ctxt, eflags, &extraFree); }