X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrstr.c;h=461283ac49f81fbf62fe929d2ba8a3bb73652881;hb=3309ec3ad8a5db735eaa2de7f5dc6a331d8e7319;hp=4a60479148293f210ab6242a8a9b9f10d7f7a0c6;hpb=c8f799d852e3698468a78954d82588e841cc0b70;p=pdclib.old

diff --git a/functions/string/strstr.c b/functions/string/strstr.c
index 4a60479..461283a 100644
--- a/functions/string/strstr.c
+++ b/functions/string/strstr.c
@@ -1,30 +1,51 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-#include <__NULL.h>
+/* strstr( const char *, const char * )
 
-char * strstr( 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 * 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