X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrpbrk.c;h=41211dbd55970a8b09a898490065ac3e9b6a114c;hb=d9dcf16664c81809258992e1653ecb68c8079974;hp=1006ab6d21a32b995ff3b29965310f21626447fc;hpb=c8f799d852e3698468a78954d82588e841cc0b70;p=pdclib.old

diff --git a/functions/string/strpbrk.c b/functions/string/strpbrk.c
index 1006ab6..41211db 100644
--- a/functions/string/strpbrk.c
+++ b/functions/string/strpbrk.c
@@ -1,20 +1,23 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-#include <__NULL.h>
+/* strpbrk( const char *, const char * )
 
-char * strpbrk( const char *src_1, const char * src_2 )
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <string.h>
+
+#ifndef REGTEST
+
+char * strpbrk( const char * s1, const char * s2 )
 {
-    const char * p1 = src_1;
+    const char * p1 = s1;
     const char * p2;
-    while ( *p1 != '\0' )
+    while ( *p1 )
     {
-        p2 = src_2;
-        while ( *p2 != '\0' )
+        p2 = s2;
+        while ( *p2 )
         {
             if ( *p1 == *p2++ )
             {
@@ -25,3 +28,22 @@ char * strpbrk( const char *src_1, const char * src_2 )
     }
     return NULL;
 }
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    TESTCASE( strpbrk( abcde, "x" ) == NULL );
+    TESTCASE( strpbrk( abcde, "xyz" ) == NULL );
+    TESTCASE( strpbrk( abcdx, "x" ) == &abcdx[4] );
+    TESTCASE( strpbrk( abcdx, "xyz" ) == &abcdx[4] );
+    TESTCASE( strpbrk( abcdx, "zyx" ) == &abcdx[4] );
+    TESTCASE( strpbrk( abcde, "a" ) == &abcde[0] );
+    TESTCASE( strpbrk( abcde, "abc" ) == &abcde[0] );
+    TESTCASE( strpbrk( abcde, "cba" ) == &abcde[0] );
+    return TEST_RESULTS;
+}
+#endif