don't truncate lines, don't allow tabs to back up (I think this is tested!)

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

diff --git a/usr/src/lib/libc/string/strspn.c b/usr/src/lib/libc/string/strspn.c
index 2b9b86b..f454319 100644 (file)
--- a/usr/src/lib/libc/string/strspn.c
+++ b/usr/src/lib/libc/string/strspn.c
@@ -1,38 +1,35 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
+ * Copyright (c) 1989 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 the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

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

-static char sccsid[] = "@(#)strspn.c   5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)strspn.c   5.7 (Berkeley) %G%";

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

-strspn(s, set)
-       register char *s, *set;
+#include <sys/stdc.h>
+#include <string.h>
+
+/*
+ * Span the string s2 (skip characters that are in s2).
+ */
+size_t
+strspn(s1, s2)
+       const char *s1;
+       register const char *s2;

 {
 {

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

 
 

-       while (c = *s++) {
-               for (p = set; *p; p++)
-                       if (c == *p)
-                               break;
-               if (!*p)
-                       return (n);
-               n++;
-       }
-       return (n);
+       /*
+        * Skip any characters in s2, excluding the terminating \0.
+        */
+cont:
+       c = *p++;
+       for (spanp = s2; (sc = *spanp++) != 0;)
+               if (sc == c)
+                       goto cont;
+       return (p - 1 - s1);

 }
 }