Module Name: src
Committed By: christos
Date: Thu Dec 2 16:46:22 UTC 2010
Modified Files:
src/usr.bin/make: var.c
Log Message:
>From Aleksey Cheusov: Fix unexpected behavior with:
all: test1 test2
test1:
@echo ${foo::=foo-text}
test2:
@echo $(foo::=foo-text)
Saying:
nbmake: Unclosed substitution for foo (} missing)
for test 2
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 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.160 src/usr.bin/make/var.c:1.161
--- src/usr.bin/make/var.c:1.160 Thu Dec 2 11:36:55 2010
+++ src/usr.bin/make/var.c Thu Dec 2 11:46:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $ */
+/* $NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.160 2010/12/02 16:36:55 christos Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos 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.160 2010/12/02 16:36:55 christos Exp $");
+__RCSID("$NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -2492,7 +2492,7 @@
cp = ++tstr;
break;
}
- delim = BRCLOSE;
+ delim = startc == PROPEN ? PRCLOSE : BRCLOSE;
pattern.flags = 0;
pattern.rhs = VarGetPattern(ctxt, &parsestate, errnum,
