PDCLib includes with quotes, not <>.

[pdclib] / functions / string / strpbrk.c

diff --git a/functions/string/strpbrk.c b/functions/string/strpbrk.c
index 810e40ca40b9f5b51b4e708f3699773b777c90de..1615ce3ff9d75cddfab8c16ec5120274845681e2 100644 (file)
--- a/functions/string/strpbrk.c
+++ b/functions/string/strpbrk.c
@@ -1,37 +1,47 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* strpbrk( const char *, const char * )
 
-// ----------------------------------------------------------------------------
-// C++
-
-const char * strpbrk( const char * s1, const char * s2 ) { /* TODO */ };
-char * strpbrk( char * s1, const char * s2 ) { /* TODO */ };
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
 
-// ----------------------------------------------------------------------------
-// Standard C
+#include <string.h>
 
-char * strpbrk( const char *s1, const char * s2 ) { /* TODO */ };
+#ifndef REGTEST
 
-/* PDPC code - unreviewed
+char * strpbrk( const char * s1, const char * s2 )
 {
-    const char *p1;
-    const char *p2;
-    
-    p1 = s1;
-    while (*p1 != '\0')
+    const char * p1 = s1;
+    const char * p2;
+    while ( *p1 )
     {
         p2 = s2;
-        while (*p2 != '\0')
+        while ( *p2 )
         {
-            if (*p1 == *p2) return ((char *)p1);
-            p2++;
+            if ( *p1 == *p2++ )
+            {
+                return (char *) p1;
+            }
         }
-        p1++;
+        ++p1;
     }
-    return (NULL);
+    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