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

diff --git a/functions/string/strrchr.c b/functions/string/strrchr.c
index 7750443..527065b 100644
--- a/functions/string/strrchr.c
+++ b/functions/string/strrchr.c
@@ -1,31 +1,41 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-// ----------------------------------------------------------------------------
-// C++
+/* strrchr( const char *, int c )
 
-const char * strrchr( const char * s, int c ) { /* TODO */ };
-char * strrchr( char * s, int c ) { /* 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 * strrchr( const char * s, int c ) { /* TODO */ };
+#ifndef REGTEST
 
-/* PDPC code - unreviewed
+char * strrchr( const char * s, int c )
 {
-    const char *p;
-    
-    p = s + strlen(s);
-    while (p >= s)
+    size_t i = 0;
+    while ( s[i++] );
+    do
     {
-        if (*p == (char)c) return ((char *)p);
-        p--;
-    }
-    return (NULL);
+        if ( s[--i] == (char) c )
+        {
+            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