1 files changed, 25 insertions, 20 deletions

diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c
index fc5741390..e6a2ce98d 100644
--- a/openbsd-compat/vis.c
+++ b/openbsd-compat/vis.c
@@ -10,11 +10,7 @@
  * 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. 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
+ * 3. 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.
  *
@@ -30,14 +26,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "config.h"
+#include "includes.h"
 #if !defined(HAVE_STRNVIS)
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vis.c,v 1.8 2002/02/19 19:39:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: vis.c,v 1.12 2003/06/02 20:18:35 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <ctype.h>
+#include <string.h>
 
 #include "vis.h"
 
@@ -47,8 +44,9 @@ static char rcsid[] = "$OpenBSD: vis.c,v 1.8 2002/02/19 19:39:36 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')))
+                                ((flag & VIS_SAFE) && ((c) == '\b' ||        \
+                                (c) == '\007' || (c) == '\r' ||              \
+                                isgraph((u_char)(c)))))
 
 /*
  * vis - visually encode characters
@@ -169,16 +167,20 @@ strvis(dst, src, flag)
 
 int
 strnvis(dst, src, siz, flag)
-        register char *dst;
-        register const char *src;
+        char *dst;
+        const char *src;
         size_t siz;
         int flag;
 {
-        register char c;
+        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 '\\' */
@@ -186,22 +188,25 @@ strnvis(dst, src, siz, flag)
                                         *dst++ = '\\';
                                 else {
                                         dst--;
+                                        i = 2;
                                         break;
                                 }
                         }
                         src++;
                 } else {
-                        /* vis(3) requires up to 4 chars */
-                        if (dst + 3 < end)
-                                dst = vis(dst, c, flag, *++src);
-                        else
+                        i = vis(tbuf, c, flag, *++src) - tbuf;
+                        if (dst + i <= end) {
+                                memcpy(dst, tbuf, i);
+                                dst += i;
+                        } else {
+                                src--;
                                 break;
+                        }
                 }
         }
-        *dst = '\0';
-        if (dst >= end) {
-                char tbuf[5];
-
+        if (siz > 0)
+                *dst = '\0';
+        if (dst + i > end) {
                 /* adjust return value for truncation */
                 while ((c = *src))
                         dst += vis(tbuf, c, flag, *++src) - tbuf;