BSD 4_4 release

[unix-history] / usr / src / bin / csh / str.c

diff --git a/usr/src/bin/csh/str.c b/usr/src/bin/csh/str.c
index 46e8e8d..15fe874 100644 (file)
--- a/usr/src/bin/csh/str.c
+++ b/usr/src/bin/csh/str.c
@@ -1,26 +1,54 @@
 /*-
 /*-

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

  *
  *

- * %sccs.include.redist.c%
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)str.c      5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)str.c      8.1 (Berkeley) 5/31/93";

 #endif /* not lint */
 
 #define MALLOC_INCR    128
 
 /*
  * tc.str.c: Short string package
 #endif /* not lint */
 
 #define MALLOC_INCR    128
 
 /*
  * tc.str.c: Short string package

- *          This has been a lesson of how to write buggy code!
+ *          This has been a lesson of how to write buggy code!

  */
 
  */
 

+#include <sys/types.h>

 #if __STDC__
 # include <stdarg.h>
 #else
 # include <varargs.h>
 #endif
 #if __STDC__
 # include <stdarg.h>
 #else
 # include <varargs.h>
 #endif

+#include <vis.h>

 
 #include "csh.h"
 #include "extern.h"
 
 #include "csh.h"
 #include "extern.h"


@@ -37,7 +65,8 @@ blk2short(src)
     /*
      * Count
      */
     /*
      * Count
      */

-    for (n = 0; src[n] != NULL; n++);
+    for (n = 0; src[n] != NULL; n++)
+       continue;

     sdst = dst = (Char **) xmalloc((size_t) ((n + 1) * sizeof(Char *)));
 
     for (; *src != NULL; src++)
     sdst = dst = (Char **) xmalloc((size_t) ((n + 1) * sizeof(Char *)));
 
     for (; *src != NULL; src++)


@@ -56,7 +85,8 @@ short2blk(src)
     /*
      * Count
      */
     /*
      * Count
      */

-    for (n = 0; src[n] != NULL; n++);
+    for (n = 0; src[n] != NULL; n++)
+       continue;

     sdst = dst = (char **) xmalloc((size_t) ((n + 1) * sizeof(char *)));
 
     for (; *src != NULL; src++)
     sdst = dst = (char **) xmalloc((size_t) ((n + 1) * sizeof(char *)));
 
     for (; *src != NULL; src++)


@@ -135,7 +165,8 @@ s_strcpy(dst, src)
     register Char *sdst;
 
     sdst = dst;
     register Char *sdst;
 
     sdst = dst;

-    while (*dst++ = *src++);
+    while ((*dst++ = *src++) != '\0')
+       continue;

     return (sdst);
 }
 
     return (sdst);
 }
 


@@ -150,7 +181,7 @@ s_strncpy(dst, src, n)
        return(dst);
 
     sdst = dst;
        return(dst);
 
     sdst = dst;

-    do 
+    do

        if ((*dst++ = *src++) == '\0') {
            while (--n != 0)
                *dst++ = '\0';
        if ((*dst++ = *src++) == '\0') {
            while (--n != 0)
                *dst++ = '\0';


@@ -167,9 +198,11 @@ s_strcat(dst, src)
     register short *sdst;
 
     sdst = dst;
     register short *sdst;
 
     sdst = dst;

-    while (*dst++);
+    while (*dst++)
+       continue;

     --dst;
     --dst;

-    while (*dst++ = *src++);
+    while ((*dst++ = *src++) != '\0')
+       continue;

     return (sdst);
 }
 
     return (sdst);
 }
 


@@ -181,18 +214,20 @@ s_strncat(dst, src, n)
 {
     register Char *sdst;
 
 {
     register Char *sdst;
 

-    if (n == 0) 
+    if (n == 0)

        return (dst);
 
     sdst = dst;
 
        return (dst);
 
     sdst = dst;
 

-    while (*dst++);
+    while (*dst++)
+       continue;

     --dst;
 
     --dst;
 

-    do 
+    do

        if ((*dst++ = *src++) == '\0')
            return(sdst);
        if ((*dst++ = *src++) == '\0')
            return(sdst);

-    while (--n != 0);
+    while (--n != 0)
+       continue;

 
     *dst = '\0';
     return (sdst);
 
     *dst = '\0';
     return (sdst);


@@ -233,7 +268,8 @@ s_strlen(str)
 {
     register size_t n;
 
 {
     register size_t n;
 

-    for (n = 0; *str++; n++);
+    for (n = 0; *str++; n++)
+       continue;

     return (n);
 }
 
     return (n);
 }
 


@@ -241,7 +277,8 @@ int
 s_strcmp(str1, str2)
     register Char *str1, *str2;
 {
 s_strcmp(str1, str2)
     register Char *str1, *str2;
 {

-    for (; *str1 && *str1 == *str2; str1++, str2++);
+    for (; *str1 && *str1 == *str2; str1++, str2++)
+       continue;

     /*
      * The following case analysis is necessary so that characters which look
      * negative collate low against normal characters but high against the
     /*
      * The following case analysis is necessary so that characters which look
      * negative collate low against normal characters but high against the


@@ -267,7 +304,7 @@ s_strncmp(str1, str2, n)
     do {
        if (*str1 != *str2) {
            /*
     do {
        if (*str1 != *str2) {
            /*

-            * The following case analysis is necessary so that characters 
+            * The following case analysis is necessary so that characters

             * which look negative collate low against normal characters
             * but high against the end-of-string NUL.
             */
             * which look negative collate low against normal characters
             * but high against the end-of-string NUL.
             */


@@ -295,9 +332,11 @@ s_strsave(s)
 
     if (s == 0)
        s = STRNULL;
 
     if (s == 0)
        s = STRNULL;

-    for (p = s; *p++;);
+    for (p = s; *p++;)
+       continue;

     n = p = (Char *) xmalloc((size_t) ((p - s) * sizeof(Char)));
     n = p = (Char *) xmalloc((size_t) ((p - s) * sizeof(Char)));

-    while (*p++ = *s++);
+    while ((*p++ = *s++) != '\0')
+       continue;

     return (n);
 }
 
     return (n);
 }
 


@@ -312,12 +351,16 @@ s_strspl(cp, dp)
        cp = STRNULL;
     if (!dp)
        dp = STRNULL;
        cp = STRNULL;
     if (!dp)
        dp = STRNULL;

-    for (p = cp; *p++;);
-    for (q = dp; *q++;);
+    for (p = cp; *p++;)
+       continue;
+    for (q = dp; *q++;)
+       continue;

     ep = (Char *) xmalloc((size_t)
                          (((p - cp) + (q - dp) - 1) * sizeof(Char)));
     ep = (Char *) xmalloc((size_t)
                          (((p - cp) + (q - dp) - 1) * sizeof(Char)));

-    for (p = ep, q = cp; *p++ = *q++;);
-    for (p--, q = dp; *p++ = *q++;);
+    for (p = ep, q = cp; (*p++ = *q++) != '\0';)
+       continue;
+    for (p--, q = dp; (*p++ = *q++) != '\0';)
+       continue;

     return (ep);
 }
 
     return (ep);
 }
 


@@ -332,7 +375,6 @@ s_strend(cp)
     return (cp);
 }
 
     return (cp);
 }
 

-# ifdef NOTUSED

 Char   *
 s_strstr(s, t)
     register Char *s, *t;
 Char   *
 s_strstr(s, t)
     register Char *s, *t;


@@ -348,7 +390,6 @@ s_strstr(s, t)
     } while (*s++ != '\0');
     return (NULL);
 }
     } while (*s++ != '\0');
     return (NULL);
 }

-# endif

 #endif                         /* SHORT_STRINGS */
 
 char   *
 #endif                         /* SHORT_STRINGS */
 
 char   *


@@ -391,3 +432,36 @@ short2qstr(src)
     *dst = 0;
     return (sdst);
 }
     *dst = 0;
     return (sdst);
 }

+
+/*
+ * XXX: Should we worry about QUOTE'd chars?
+ */
+char *
+vis_str(cp)
+    Char *cp;
+{
+    static char *sdst = NULL;
+    static size_t dstsize = 0;
+    size_t n;
+    Char *dp;
+
+    if (cp == NULL)
+       return (NULL);
+    
+    for (dp = cp; *dp++;)
+       continue;
+    n = ((dp - cp) << 2) + 1; /* 4 times + NULL */
+    if (dstsize < n) {
+       sdst = (char *) (dstsize ? 
+                           xrealloc(sdst, (size_t) n * sizeof(char)) :
+                           xmalloc((size_t) n * sizeof(char)));
+       dstsize = n;
+    }
+    /* 
+     * XXX: When we are in AsciiOnly we want all characters >= 0200 to
+     * be encoded, but currently there is no way in vis to do that.
+     */
+    (void) strvis(sdst, short2str(cp), VIS_NOSLASH);
+    return (sdst);
+}
+