X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstring%2Fstrrchr.c;h=2a41874b64833dd9953b0ee2213f728b1ecf7a4e;hp=8ad992ae69402c35c0e309ca93dab0a9335f827f;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=d35060079d924391f4c36ab8b859bbfd7bb38ffe

diff --git a/functions/string/strrchr.c b/functions/string/strrchr.c
index 8ad992a..2a41874 100644
--- a/functions/string/strrchr.c
+++ b/functions/string/strrchr.c
@@ -1,7 +1,3 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
 /* strrchr( const char *, int c )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,16 +6,34 @@
 
 #include <string.h>
 
+#ifndef REGTEST
+
 char * strrchr( const char * s, int c )
 {
     size_t i = 0;
-    while ( p[i++] );
+    while ( s[i++] );
     do
     {
-        if ( p[--i] == (char) c )
+        if ( s[--i] == (char) c )
         {
-            return (char *) p + i;
+            return (char *) s + i;
         }
     } 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