summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2011-08-16 14:18:26 +0000
committerMarc Espie <espie@cvs.openbsd.org>2011-08-16 14:18:26 +0000
commit0a0374b98dce4aacafc7cfb36bd4012cafd95829 (patch)
tree747bb6311c0b90af2aada53c405d5510595acfe5 /usr.bin
parent7d91d2a9a173d0f842a9be82c870cd5431f233c5 (diff)
recommit, now that release is done (handle sysv if bsd is incorrect, may
make more extensive plans later)
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/varmodifiers.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/make/varmodifiers.c b/usr.bin/make/varmodifiers.c
index f32c6787967..a878a478950 100644
--- a/usr.bin/make/varmodifiers.c
+++ b/usr.bin/make/varmodifiers.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: varmodifiers.c,v 1.29 2011/07/30 21:02:13 espie Exp $ */
+/* $OpenBSD: varmodifiers.c,v 1.30 2011/08/16 14:18:25 espie Exp $ */
/* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */
/*
@@ -629,7 +629,8 @@ get_sysvpattern(const char **p, SymTable *ctxt UNUSED, bool err, int endc)
}
Buf_Init(&buf, 0);
for (cp2 = cp+1;; cp2++) {
- if ((*cp2 == ':' || *cp2 == endc) && cnt == 0)
+ if (((*cp2 == ':' && cp2[1] != endc) || *cp2 == endc) &&
+ cnt == 0)
break;
if (*cp2 == '\0') {
Buf_Destroy(&buf);