BSD 4_4 release

[unix-history] / usr / src / lib / libc / string / strcspn.c

diff --git a/usr/src/lib/libc/string/strcspn.c b/usr/src/lib/libc/string/strcspn.c
index 7a460d8..a1c2e1d 100644 (file)
--- a/usr/src/lib/libc/string/strcspn.c
+++ b/usr/src/lib/libc/string/strcspn.c
@@ -1,33 +1,68 @@
-/*
- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.
+/*-
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * 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.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific written prior permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * 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[] = "@(#)strcspn.c  5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)strcspn.c  8.1 (Berkeley) 6/4/93";

 #endif /* LIBC_SCCS and not lint */
 
 #endif /* LIBC_SCCS and not lint */
 

-strcspn(s, set)
-       register char *s, *set;
+#include <sys/cdefs.h>
+#include <string.h>
+
+/*
+ * Span the complement of string s2.
+ */
+size_t
+strcspn(s1, s2)
+       const char *s1;
+       register const char *s2;

 {
 {

-       register n = 0;
-       register char *p;
-       register c;
+       register const char *p, *spanp;
+       register char c, sc;

 
 

-       while (c = *s++) {
-               for (p = set; *p; p++)
-                       if (c == *p)
-                               break;
-               if (*p)
-                       return (n);
-               n++;
+       /*
+        * Stop as soon as we find any character from s2.  Note that there
+        * must be a NUL in s2; it suffices to stop when we find that, too.
+        */
+       for (p = s1;;) {
+               c = *p++;
+               spanp = s2;
+               do {
+                       if ((sc = *spanp++) == c)
+                               return (p - 1 - s1);
+               } while (sc != 0);

        }
        }

-       return (n);
+       /* NOTREACHED */

 }
 }