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 09326ac..ffb59df 100644 (file)
--- a/usr/src/lib/libc/string/strpbrk.c
+++ b/usr/src/lib/libc/string/strpbrk.c
@@ -1,29 +1,43 @@
 /*
  * Copyright (c) 1985 Regents of the University of California.
 /*
  * Copyright (c) 1985 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * 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
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
  */
 

-/*
- * Sys 5 compat routine...
- */
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)strpbrk.c  5.7 (Berkeley) 6/1/90";
+#endif /* LIBC_SCCS and not lint */

 
 

-#ifndef lint
-static char sccsid[] = "@(#)strpbrk.c  5.1 (Berkeley) 85/08/05";
-#endif
+#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);

 }
 }