X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrstr.c;h=4a60479148293f210ab6242a8a9b9f10d7f7a0c6;hb=1d9d92ba957a0b8307c9a65c35867fde68e6533b;hp=a1f8b74b329c428f1e825acfdaa568bda6c75c09;hpb=0a5395faab237ba9008352b0f4bee9659bbd3d5f;p=pdclib

diff --git a/functions/string/strstr.c b/functions/string/strstr.c
index a1f8b74..4a60479 100644
--- a/functions/string/strstr.c
+++ b/functions/string/strstr.c
@@ -1,39 +1,30 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
+ * $Id$
+ * ----------------------------------------------------------------------------
+ * Public Domain C Library - http://pdclib.sourceforge.net
+ * This code is Public Domain. Use, modify, and redistribute at will.
+ * --------------------------------------------------------------------------*/
 
-// ----------------------------------------------------------------------------
-// C++
+#include <__NULL.h>
 
-const char * strstr( const char * s1, const char * s2 ) { /* TODO */ };
-char * strstr( char * s1, const char * s2 ) { /* TODO */ };
-
-// ----------------------------------------------------------------------------
-// Standard C
-
-char * strstr( const char * s1, const char * s2 ) { /* TODO */ };
-
-/* PDPC code - unreviewed
+char * strstr( const char * src_1, const char * src_2 )
 {
-    const char *p = s1, *p1, *p2 = s2;
-
-    while (*p)
+    const char * p1 = src_1;
+    const char * p2;
+    while ( *src_1 != '\0' )
     {
-        if (*p == *s2)
+        p2 = src_2;
+        while ( ( *p2 != '\0' ) && ( *p1 == *p2 ) )
+        {
+            ++p1;
+            ++p2;
+        }
+        if ( *p2 == '\0' )
         {
-            p1 = p;
-            p2 = s2;
-            while ((*p2 != '\0') && (*p1++ == *p2++)) ;
-            if (*p2 == '\0')
-            {
-                return (char *)p;
-            }
+            return (char *) src_1;
         }
-        p++;
+        ++src_1;
+        p1 = src_1;
     }
     return NULL;
 }
-*/