From 67a09fffe1943695a3f78b547bdf15c2ec4a10ec Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Sat, 12 May 2007 23:29:33 +0000
Subject: [PATCH] Replace rev. 1.9 with patch from OpenBSD.

Submitted by:	Ray Lai <ray@cyth.net>
Obtained from:	http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/tip/acu.c.diff?r1=1.13&r2=1.14
MFC after:	1 week
---
 usr.bin/tip/tip/acu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 78786981f113..5d2cda624c02 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -100,10 +100,10 @@ con(void)
 	if ((acu = acutype(AT)) == NOACU)
 		return ("unknown ACU type");
 	if (*cp != '@') {
-		while (cp != NULL && *cp) {
+		while (*cp) {
 			phnum = cp;
-			cp = strpbrk(cp, ",");
-			if (cp != NULL && *cp != '\0')
+			cp += strcspn(cp, ",");
+			if (*cp != '\0')
 				*cp++ = '\0';
 
 			if (strlen(phnum) == 0)