Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make Don't assume startc is always {, set delim to e...



details:   https://anonhg.NetBSD.org/src/rev/43f8c81b4ba6
branches:  trunk
changeset: 556730:43f8c81b4ba6
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Dec 26 08:03:06 2003 +0000

description:
Don't assume startc is always {, set delim to endc when separating the args to
the ? test.

diffstat:

 usr.bin/make/var.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 1da038aebe50 -r 43f8c81b4ba6 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Fri Dec 26 06:20:40 2003 +0000
+++ b/usr.bin/make/var.c        Fri Dec 26 08:03:06 2003 +0000
@@ -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 @@
                                                     NULL)) == NULL)
                        goto cleanup;
 
-                       /* '{' */
-                   delim = '}';
+                       /* '{' or '(' */
+                   delim = endc;
                    if ((pattern.rhs = VarGetPattern(ctxt, &parsestate, err,
                                                     &cp, delim, NULL,
                                                     &pattern.rightLen,



Home | Main Index | Thread Index | Old Index