X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrrchr.c;h=4fe9a6b49acd8c00597b5da7bbd567985880883e;hb=ba5eff8dd9b426485e1559b5d6204692d155d9e8;hp=4f1e2b5cb58fbd230de5b04776d5050f62cc14f0;hpb=1d9d92ba957a0b8307c9a65c35867fde68e6533b;p=pdclib

diff --git a/functions/string/strrchr.c b/functions/string/strrchr.c
index 4f1e2b5..4fe9a6b 100644
--- a/functions/string/strrchr.c
+++ b/functions/string/strrchr.c
@@ -1,26 +1,34 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-#include <__NULL.h>
+/* Release $Name$ */
 
-char * strrchr( const char * src, int c )
+/* strrchr( const char *, int c )
+
+   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>
+
+char * strrchr( const char * s, int c )
 {
-    const char * p = src;
-    while ( *p != '\0' )
-    {
-        ++p;
-    }
-    while ( p >= src )
+    size_t i = 0;
+    while ( s[i++] );
+    do
     {
-        if ( *p == (char) c )
+        if ( s[--i] == (char) c )
         {
-            return (char *) p;
+            return (char *) s + i;
         }
-        --p;
-    }
+    } while ( i );
     return NULL;
 }
+
+#warning Test driver missing.
+
+#ifdef TEST
+int main()
+{
+    return 0;
+}
+#endif