diff options
author | 2011-08-16 14:18:25 +0000 | |
---|---|---|
committer | 2011-08-16 14:18:25 +0000 | |
commit | 5694c93bb557b283594bda9f08194b19ff62cd08 (patch) | |
tree | 1415d85e091deeb6a849fe2ecd61b4b392b29f8d | |
parent | Add a -r flag to switch-client to toggle the client read-only flag. From (diff) | |
download | wireguard-openbsd-5694c93bb557b283594bda9f08194b19ff62cd08.tar.xz wireguard-openbsd-5694c93bb557b283594bda9f08194b19ff62cd08.zip |
recommit, now that release is done (handle sysv if bsd is incorrect, may
make more extensive plans later)
-rw-r--r-- | usr.bin/make/varmodifiers.c | 5 |
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); |