1 files changed, 20 insertions, 25 deletions

diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c
index e6a2ce98d..fc5741390 100644
--- a/openbsd-compat/vis.c
+++ b/openbsd-compat/vis.c
@@ -10,7 +10,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -26,15 +30,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "includes.h"
+#include "config.h"
 #if !defined(HAVE_STRNVIS)
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vis.c,v 1.12 2003/06/02 20:18:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: vis.c,v 1.8 2002/02/19 19:39:36 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <ctype.h>
-#include <string.h>
 
 #include "vis.h"
 
@@ -44,9 +47,8 @@ static char rcsid[] = "$OpenBSD: vis.c,v 1.12 2003/06/02 20:18:35 millert Exp $"
                                 ((flag & VIS_SP) == 0 && (c) == ' ') ||      \
                                 ((flag & VIS_TAB) == 0 && (c) == '\t') ||    \
                                 ((flag & VIS_NL) == 0 && (c) == '\n') ||     \
-                                ((flag & VIS_SAFE) && ((c) == '\b' ||        \
-                                (c) == '\007' || (c) == '\r' ||              \
-                                isgraph((u_char)(c)))))
+                                ((flag & VIS_SAFE) &&                        \
+                                ((c) == '\b' || (c) == '\007' || (c) == '\r')))
 
 /*
  * vis - visually encode characters
@@ -167,20 +169,16 @@ strvis(dst, src, flag)
 
 int
 strnvis(dst, src, siz, flag)
-        char *dst;
-        const char *src;
+        register char *dst;
+        register const char *src;
         size_t siz;
         int flag;
 {
-        char c;
+        register char c;
         char *start, *end;
-        char tbuf[5];
-        int  i;
 
-        i = 0;
         for (start = dst, end = start + siz - 1; (c = *src) && dst < end; ) {
                 if (isvisible(c)) {
-                        i = 1;
                         *dst++ = c;
                         if (c == '\\' && (flag & VIS_NOSLASH) == 0) {
                                 /* need space for the extra '\\' */
@@ -188,25 +186,22 @@ strnvis(dst, src, siz, flag)
                                         *dst++ = '\\';
                                 else {
                                         dst--;
-                                        i = 2;
                                         break;
                                 }
                         }
                         src++;
                 } else {
-                        i = vis(tbuf, c, flag, *++src) - tbuf;
-                        if (dst + i <= end) {
-                                memcpy(dst, tbuf, i);
-                                dst += i;
-                        } else {
-                                src--;
+                        /* vis(3) requires up to 4 chars */
+                        if (dst + 3 < end)
+                                dst = vis(dst, c, flag, *++src);
+                        else
                                 break;
-                        }
                 }
         }
-        if (siz > 0)
-                *dst = '\0';
-        if (dst + i > end) {
+        *dst = '\0';
+        if (dst >= end) {
+                char tbuf[5];
+
                 /* adjust return value for truncation */
                 while ((c = *src))
                         dst += vis(tbuf, c, flag, *++src) - tbuf;