BSD 4_4 release

[unix-history] / usr / src / lib / libc / gen / vis.c

diff --git a/usr/src/lib/libc/gen/vis.c b/usr/src/lib/libc/gen/vis.c
index c6f1932..2232149 100644 (file)
--- a/usr/src/lib/libc/gen/vis.c
+++ b/usr/src/lib/libc/gen/vis.c
@@ -1,27 +1,42 @@
 /*-
 /*-

- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)vis.c      5.3 (Berkeley) 6/26/90";
+static char sccsid[] = "@(#)vis.c      8.1 (Berkeley) 7/19/93";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

+#include <limits.h>

 #include <ctype.h>
 #include <vis.h>
 
 #include <ctype.h>
 #include <vis.h>
 


@@ -32,11 +47,11 @@ static char sccsid[] = "@(#)vis.c   5.3 (Berkeley) 6/26/90";
  */
 char *
 vis(dst, c, flag, nextc)
  */
 char *
 vis(dst, c, flag, nextc)

-       register char *dst, c;
-       char nextc;
+       register char *dst;
+       int c, nextc;

        register int flag;
 {
        register int flag;
 {

-       if (isascii(c) && isgraph(c) ||
+       if ((u_int)c <= UCHAR_MAX && isgraph(c) ||

           ((flag & VIS_SP) == 0 && c == ' ') ||
           ((flag & VIS_TAB) == 0 && c == '\t') ||
           ((flag & VIS_NL) == 0 && c == '\n') ||
           ((flag & VIS_SP) == 0 && c == ' ') ||
           ((flag & VIS_TAB) == 0 && c == '\t') ||
           ((flag & VIS_NL) == 0 && c == '\n') ||


@@ -62,7 +77,11 @@ vis(dst, c, flag, nextc)
                        *dst++ = '\\';
                        *dst++ = 'b';
                        goto done;
                        *dst++ = '\\';
                        *dst++ = 'b';
                        goto done;

-               case '\007':    /* waiting for ansi compiler */
+#if __STDC__
+               case '\a':
+#else
+               case '\007':
+#endif

                        *dst++ = '\\';
                        *dst++ = 'a';
                        goto done;
                        *dst++ = '\\';
                        *dst++ = 'a';
                        goto done;


@@ -130,30 +149,38 @@ done:
  *     Strvisx encodes exactly len bytes from src into dst.
  *     This is useful for encoding a block of data.
  */
  *     Strvisx encodes exactly len bytes from src into dst.
  *     This is useful for encoding a block of data.
  */

+int

 strvis(dst, src, flag)
 strvis(dst, src, flag)

-       register char *dst, *src;
+       register char *dst;
+       register const char *src;
+       int flag;

 {
        register char c;
 {
        register char c;

-       char *start = dst;
-
-       for (;c = *src; src++)
-               dst = vis(dst, c, flag, *(src+1));
+       char *start;

 
 

+       for (start = dst; c = *src;)
+               dst = vis(dst, c, flag, *++src);
+       *dst = '\0';

        return (dst - start);
 }
 
        return (dst - start);
 }
 

+int

 strvisx(dst, src, len, flag)
 strvisx(dst, src, len, flag)

-       register char *dst, *src;
-       register int len;
+       register char *dst;
+       register const char *src;
+       register size_t len;
+       int flag;

 {
 {

-       char *start = dst;
+       int c;
+       char *start;

 
 

-       while (len > 1) {
-               dst = vis(dst, *src, flag, *(src+1));
-               len--;
+       for (start = dst; len > 1; len--) {
+               c = *src;
+               dst = vis(dst, c, flag, *++src);

        }
        if (len)
                dst = vis(dst, *src, flag, '\0');
        }
        if (len)
                dst = vis(dst, *src, flag, '\0');

+       *dst = '\0';

 
        return (dst - start);
 }
 
        return (dst - start);
 }