summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2011-07-30 21:02:14 +0000
committerMarc Espie <espie@cvs.openbsd.org>2011-07-30 21:02:14 +0000
commit32a00f09dac2941b60cda4e21ed78a426667ec46 (patch)
treee0ed9ff71095a2a06c9b36650adfa41e915fbf9b
parent7632ab37a7bac15f92a3835a309dad9df2c68f00 (diff)
deemed unsafe by theo, will wait after 5.0
-rw-r--r--usr.bin/make/varmodifiers.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/make/varmodifiers.c b/usr.bin/make/varmodifiers.c
index d7cb2c6ebd7..f32c6787967 100644
--- a/usr.bin/make/varmodifiers.c
+++ b/usr.bin/make/varmodifiers.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: varmodifiers.c,v 1.28 2011/07/29 13:39:00 espie Exp $ */
+/* $OpenBSD: varmodifiers.c,v 1.29 2011/07/30 21:02:13 espie Exp $ */
/* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */
/*
@@ -629,8 +629,7 @@ get_sysvpattern(const char **p, SymTable *ctxt UNUSED, bool err, int endc)
}
Buf_Init(&buf, 0);
for (cp2 = cp+1;; cp2++) {
- if (((*cp2 == ':' && cp2[1] != endc) || *cp2 == endc) &&
- cnt == 0)
+ if ((*cp2 == ':' || *cp2 == endc) && cnt == 0)
break;
if (*cp2 == '\0') {
Buf_Destroy(&buf);