summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-07-04 13:33:48 +0000
committerru <ru@FreeBSD.org>2003-07-04 13:33:48 +0000
commit4360edf5db42a77ef46deb106df65ac60db3dabf (patch)
tree639a48bdc2c6b1829d4a194c0847c8e764e5dd3e /usr.bin
parent3875fcca40a9c1755351e1251d04fec77328ed18 (diff)
downloadFreeBSD-src-4360edf5db42a77ef46deb106df65ac60db3dabf.zip
FreeBSD-src-4360edf5db42a77ef46deb106df65ac60db3dabf.tar.gz
Fixed broken arithmetic expression parser.
Reminded by: bde In memory of: alane
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/cond.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 6f82ecb..8eab811 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -688,16 +688,13 @@ do_string_compare:
}
} else {
char *c = CondCvtArg(rhs, &right);
- if (*c != '\0' && !isspace((unsigned char) *c))
+ if (c == rhs)
goto do_string_compare;
if (rhs == condExpr) {
/*
* Skip over the right-hand side
*/
- while(!isspace((unsigned char) *condExpr) &&
- (*condExpr != '\0')) {
- condExpr++;
- }
+ condExpr = c;
}
}
OpenPOWER on IntegriCloud