PDCLib includes with quotes, not <>.

[pdclib] / functions / string / strstr.c

diff --git a/functions/string/strstr.c b/functions/string/strstr.c
index 55f1db60dab91bf4a886fdc37ab099ec10ac0de9..5c97a750c076400c90bf61520c1f26b9c24e880a 100644 (file)
--- a/functions/string/strstr.c
+++ b/functions/string/strstr.c
@@ -1,30 +1,49 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* strstr( const char *, const char * )
 
-#include <__NULL.h>
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
 
-char * strstr( const char * src_1, const char * src_2 )
+#include <string.h>
+
+#ifndef REGTEST
+
+char * strstr( const char * s1, const char * s2 )
 {
-    const char * p1 = src_1;
+    const char * p1 = s1;
     const char * p2;
-    while ( *src_1 != '\0' )
+    while ( *s1 )
     {
-        p2 = src_2;
-        while ( ( *p2 != '\0' ) && ( *p1 == *p2 ) )
+        p2 = s2;
+        while ( *p2 && ( *p1 == *p2 ) )
         {
             ++p1;
             ++p2;
         }
-        if ( *p2 == '\0' )
+        if ( ! *p2 )
         {
-            return (char *) src_1;
+            return (char *) s1;
         }
-        ++src_1;
-        p1 = src_1;
+        ++s1;
+        p1 = s1;
     }
     return NULL;
 }
+
+#endif
+
+#ifdef TEST
+#include "_PDCLIB_test.h"
+
+int main( void )
+{
+    char s[] = "abcabcabcdabcde";
+    TESTCASE( strstr( s, "x" ) == NULL );
+    TESTCASE( strstr( s, "xyz" ) == NULL );
+    TESTCASE( strstr( s, "a" ) == &s[0] );
+    TESTCASE( strstr( s, "abc" ) == &s[0] );
+    TESTCASE( strstr( s, "abcd" ) == &s[6] );
+    TESTCASE( strstr( s, "abcde" ) == &s[10] );
+    return TEST_RESULTS;
+}
+#endif