summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authorjmc <jmc@NetBSD.org>2003-12-26 08:03:06 +0000
committerjmc <jmc@NetBSD.org>2003-12-26 08:03:06 +0000
commitc7c6bf2bbd7bcca40457de0d0f54d5fb7cb0b027 (patch)
treee1f911d02102ea500124d1dd6d035622d60d2c72 /usr.bin/make
parent50333acbf4dc0214f87947a7af0d56b2670bf52c (diff)
Don't assume startc is always {, set delim to endc when separating the args to
the ? test.
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/var.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index e7eda49ea14..526d25b8f69 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.82 2003/10/23 15:58:29 jmc Exp $ */
+/* $NetBSD: var.c,v 1.83 2003/12/26 08:03:06 jmc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: var.c,v 1.82 2003/10/23 15:58:29 jmc Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.83 2003/12/26 08:03:06 jmc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.82 2003/10/23 15:58:29 jmc Exp $");
+__RCSID("$NetBSD: var.c,v 1.83 2003/12/26 08:03:06 jmc Exp $");
#endif
#endif /* not lint */
#endif
@@ -2858,8 +2858,8 @@ Var_Parse(const char *str, GNode *ctxt, Boolean err, int *lengthPtr,
NULL)) == NULL)
goto cleanup;
- /* '{' */
- delim = '}';
+ /* '{' or '(' */
+ delim = endc;
if ((pattern.rhs = VarGetPattern(ctxt, &parsestate, err,
&cp, delim, NULL,
&pattern.rightLen,