X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrrchr.c;h=527065baaab25f612d3674c5998071a6bbd16230;hb=cd6cfe0f578c4f744ddc9a342243aff6b42f8027;hp=6ce1a3231de2f67bc7be3c5994cecfe165ba1244;hpb=96c55f60f49ceb842cf30e0018bb963ef9ed7d1c;p=pdclib.old

diff --git a/functions/string/strrchr.c b/functions/string/strrchr.c
index 6ce1a32..527065b 100644
--- a/functions/string/strrchr.c
+++ b/functions/string/strrchr.c
@@ -1,26 +1,41 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-#include <__NULL.h>
+/* strrchr( const char *, int c )
 
-char * strrchr( const char * src, 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>
+
+#ifndef REGTEST
+
+char * strrchr( const char * s, int c )
 {
-    const char * p = src;
-    while ( *p != '\0' )
+    size_t i = 0;
+    while ( s[i++] );
+    do
     {
-        ++p;
-    }
-    while ( p >= src )
-    {
-        if ( *p == (char) c )
+        if ( s[--i] == (char) c )
         {
-            return (char *) p;
+            return (char *) s + i;
         }
-        --p;
-    }
+    } while ( i );
     return NULL;
 }
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    char abccd[] = "abccd";
+    TESTCASE( strrchr( abcde, '\0' ) == &abcde[5] );
+    TESTCASE( strrchr( abcde, 'e' ) == &abcde[4] );
+    TESTCASE( strrchr( abcde, 'a' ) == &abcde[0] );
+    TESTCASE( strrchr( abccd, 'c' ) == &abccd[3] );
+    return TEST_RESULTS;
+}
+#endif