diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-10 22:03:59 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-10 22:03:59 +0000 |
| commit | 28a6bc8146c375222cee5fa52e752a99b921479b (patch) | |
| tree | 55e17b1e670746d9e5a85e6f1585f57a143fe34e /contrib/bmake/var.c | |
| parent | 3e5645b78f476816ca3b5acc28b29bbafbb9c444 (diff) | |
| parent | c21ae9a30b65109a8ba1505c1ff55eeca86c0e03 (diff) | |
| download | src-28a6bc8146c375222cee5fa52e752a99b921479b.tar.gz src-28a6bc8146c375222cee5fa52e752a99b921479b.zip | |
Merge bmake-20150505 improve detection of malformed conditionals.
Notes
Notes:
svn path=/head/; revision=282740
Diffstat (limited to 'contrib/bmake/var.c')
| -rw-r--r-- | contrib/bmake/var.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/bmake/var.c b/contrib/bmake/var.c index 2a94dee4196d..e15c301cf9cf 100644 --- a/contrib/bmake/var.c +++ b/contrib/bmake/var.c @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.191 2014/09/14 02:32:51 dholland Exp $ */ +/* $NetBSD: var.c,v 1.192 2015/05/05 21:51:09 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: var.c,v 1.191 2014/09/14 02:32:51 dholland Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.192 2015/05/05 21:51:09 sjg 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.191 2014/09/14 02:32:51 dholland Exp $"); +__RCSID("$NetBSD: var.c,v 1.192 2015/05/05 21:51:09 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -3261,7 +3261,7 @@ ApplyModifiers(char *nstr, const char *tstr, termc = *--cp; delim = '\0'; - if (Cond_EvalExpression(NULL, v->name, &value, 0) + if (Cond_EvalExpression(NULL, v->name, &value, 0, FALSE) == COND_INVALID) { Error("Bad conditional expression `%s' in %s?%s:%s", v->name, v->name, pattern.lhs, pattern.rhs); |