diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-10 22:03:59 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-10 22:03:59 +0000 |
| commit | bc53a56c01080bcfa62c2433c36de981d18eb977 (patch) | |
| tree | 55e17b1e670746d9e5a85e6f1585f57a143fe34e /contrib/bmake/var.c | |
| parent | 2c4686751c3442d00e8ca8a4684be7de7901df5a (diff) | |
| parent | 168edd726ad8a54339e142aec8bee10c893b7326 (diff) | |
| download | FreeBSD-src-bc53a56c01080bcfa62c2433c36de981d18eb977.zip FreeBSD-src-bc53a56c01080bcfa62c2433c36de981d18eb977.tar.gz | |
Merge bmake-20150505 improve detection of malformed conditionals.
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 2a94dee..e15c301 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); |
