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

diff --git a/functions/string/strstr.c b/functions/string/strstr.c
index a1f8b74..461283a 100644
--- a/functions/string/strstr.c
+++ b/functions/string/strstr.c
@@ -1,39 +1,51 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-// ----------------------------------------------------------------------------
-// C++
+/* strstr( const char *, const char * )
 
-const char * strstr( const char * s1, const char * s2 ) { /* TODO */ };
-char * strstr( 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 * strstr( const char * s1, const char * s2 ) { /* TODO */ };
+#ifndef REGTEST
 
-/* PDPC code - unreviewed
+char * strstr( const char * s1, const char * s2 )
 {
-    const char *p = s1, *p1, *p2 = s2;
-
-    while (*p)
+    const char * p1 = s1;
+    const char * p2;
+    while ( *s1 )
     {
-        if (*p == *s2)
+        p2 = s2;
+        while ( *p2 && ( *p1 == *p2 ) )
         {
-            p1 = p;
-            p2 = s2;
-            while ((*p2 != '\0') && (*p1++ == *p2++)) ;
-            if (*p2 == '\0')
-            {
-                return (char *)p;
-            }
+            ++p1;
+            ++p2;
         }
-        p++;
+        if ( ! *p2 )
+        {
+            return (char *) s1;
+        }
+        ++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