From 88d99352fdd66889764413ea7883ff60953a3e34 Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@cvs.openbsd.org>
Date: Sun, 25 Apr 2010 14:32:05 +0000
Subject: ftpvis was not ok.  fix it.

---
 usr.bin/ftp/complete.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c
index 245bc572b5f..2092cb8cfd1 100644
--- a/usr.bin/ftp/complete.c
+++ b/usr.bin/ftp/complete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: complete.c,v 1.24 2010/04/25 09:11:54 stsp Exp $	*/
+/*	$OpenBSD: complete.c,v 1.25 2010/04/25 14:32:04 tedu Exp $	*/
 /*	$NetBSD: complete.c,v 1.10 1997/08/18 10:20:18 lukem Exp $	*/
 
 /*-
@@ -358,16 +358,8 @@ ftpvis(char *dst, size_t dstlen, const char *src, size_t srclen)
 {
 	size_t	di, si;
 
-	/* paranoia paranoia everybody's trying to get me */
-	if (dstlen == 0)
-		return;
-	if (srclen == 0) {
-		dst[0] = '\0';
-		return;
-	}
-		
 	di = si = 0;
-	while (src[si] != '\0' && di < dstlen && si < srclen) {
+	while (di + 1 < dstlen && si < srclen && src[si] != '\0') {
 		switch (src[si]) {
 		case '\\':
 		case ' ':
@@ -377,18 +369,15 @@ ftpvis(char *dst, size_t dstlen, const char *src, size_t srclen)
 		case '"':
 			/* Need room for two characters and NUL, avoiding
 			 * incomplete escape sequences at end of dst. */
-			if (di >= dstlen - 3)
+			if (di + 3 >= dstlen)
 				break;
 			dst[di++] = '\\';
 			/* FALLTHROUGH */
 		default:
-			dst[di] = src[si++];
-			if (di < dstlen)
-				di++;
+			dst[di++] = src[si++];
 		}
 	}
-	dst[di] = '\0';
+	if (dstlen != 0)
+		dst[di] = '\0';
 }
-
 #endif /* !SMALL */
-
-- 
cgit v1.2.3