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 2498d7b..15fe874 100644 (file)
--- a/usr/src/bin/csh/str.c
+++ b/usr/src/bin/csh/str.c
@@ -1,12 +1,38 @@
 /*-
 /*-

- * 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.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)str.c      8.1 (Berkeley) 5/31/93";

 #endif /* not lint */
 
 #define MALLOC_INCR    128
 #endif /* not lint */
 
 #define MALLOC_INCR    128


@@ -16,11 +42,13 @@ static char sccsid[] = "@(#)str.c   5.10 (Berkeley) %G%";
  *          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"


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

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

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


@@ -173,7 +201,7 @@ s_strcat(dst, src)
     while (*dst++)
        continue;
     --dst;
     while (*dst++)
        continue;
     --dst;

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

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


@@ -307,7 +335,7 @@ s_strsave(s)
     for (p = s; *p++;)
        continue;
     n = p = (Char *) xmalloc((size_t) ((p - s) * sizeof(Char)));
     for (p = s; *p++;)
        continue;
     n = p = (Char *) xmalloc((size_t) ((p - s) * sizeof(Char)));

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

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


@@ -329,9 +357,9 @@ s_strspl(cp, dp)
        continue;
     ep = (Char *) xmalloc((size_t)
                          (((p - cp) + (q - dp) - 1) * sizeof(Char)));
        continue;
     ep = (Char *) xmalloc((size_t)
                          (((p - cp) + (q - dp) - 1) * sizeof(Char)));

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

        continue;
        continue;

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

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


@@ -404,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);
+}
+