BSD 4_3_Reno release

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

diff --git a/usr/src/lib/libc/string/strpbrk.c b/usr/src/lib/libc/string/strpbrk.c
index 2c8a8fb..ffb59df 100644 (file)
--- a/usr/src/lib/libc/string/strpbrk.c
+++ b/usr/src/lib/libc/string/strpbrk.c
@@ -3,34 +3,41 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * 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
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * 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.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

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

-static char sccsid[] = "@(#)strpbrk.c  5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)strpbrk.c  5.7 (Berkeley) 6/1/90";

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

+#include <string.h>
+#include <sys/stdc.h>
+
+/*
+ * Find the first occurrence in s1 of a character in s2 (excluding NUL).
+ */

 char *
 char *

-strpbrk(s, brk)
-       register char *s, *brk;
+strpbrk(s1, s2)
+       register const char *s1, *s2;

 {
 {

-       register char *p;
-       register c;
+       register const char *scanp;
+       register int c, sc;

 
 

-       while (c = *s) {
-               for (p = brk; *p; p++)
-                       if (c == *p)
-                               return (s);
-               s++;
+       while ((c = *s1++) != 0) {
+               for (scanp = s2; (sc = *scanp++) != 0;)
+                       if (sc == c)
+                               return ((char *)(s1 - 1));

        }
        }

-       return (0);
+       return (NULL);

 }
 }