I am not sure I understood strcoll() and strxfrm() correctly, but this is it for...

[pdclib] / functions / string / strcoll.c

diff --git a/functions/string/strcoll.c b/functions/string/strcoll.c
index 51fc59f00e606d58332c564d5dfb797e6acdd0ea..16a5680b610c14ea5aaf078f60ced375095753b8 100644 (file)
--- a/functions/string/strcoll.c
+++ b/functions/string/strcoll.c
@@ -1,18 +1,41 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* strcoll( const char *, const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-/* TODO: Dummy function, PDCLib does not support locales yet. */
+#include <string.h>
+
+#ifndef REGTEST
 
-int strcmp( const char * s1, const char * s2 );
+#include <locale.h>
 
 int strcoll( const char * s1, const char * s2 )
 {
-    return strcmp( s1, s2 );
+    while ( ( *s1 ) && ( _PDCLIB_lconv.ctype[(unsigned char)*s1].collation == _PDCLIB_lconv.ctype[(unsigned char)*s2].collation ) )
+    {
+        ++s1;
+        ++s2;
+    }
+    return ( _PDCLIB_lconv.ctype[(unsigned char)*s1].collation == _PDCLIB_lconv.ctype[(unsigned char)*s2].collation );
+}
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    char cmpabcde[] = "abcde";
+    char empty[] = "";
+    TESTCASE( strcmp( abcde, cmpabcde ) == 0 );
+    TESTCASE( strcmp( abcde, abcdx ) < 0 );
+    TESTCASE( strcmp( abcdx, abcde ) > 0 );
+    TESTCASE( strcmp( empty, abcde ) < 0 );
+    TESTCASE( strcmp( abcde, empty ) > 0 );
+    return TEST_RESULTS;
 }
+#endif