Make this i386-compatible; massive clean-up.

[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..025f8e6 100644 (file)
--- a/usr/src/lib/libc/string/strcspn.c
+++ b/usr/src/lib/libc/string/strcspn.c
@@ -1,33 +1,42 @@
-/*
- * Copyright (c) 1985 Regents of the University of California.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * 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 code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * %sccs.include.redist.c%

  */
 
 #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  5.6 (Berkeley) %G%";

 #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 */

 }
 }