Moving branches closer together.

[pdclib] / functions / string / strcoll.c

diff --git a/functions/string/strcoll.c b/functions/string/strcoll.c
index 74a8aadb9a84cbb312c0d19f564730d3a509140e..a139adb4728171c50fecc6d0941d3820d1eaa173 100644 (file)
--- a/functions/string/strcoll.c
+++ b/functions/string/strcoll.c
@@ -1,30 +1,37 @@
-/* $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>
 
-int strcmp( const char * s1, const char * s2 );
+#ifndef REGTEST
+
+#include <locale.h>
 
 int strcoll( const char * s1, const char * s2 )
 {
-    return strcmp( s1, s2 );
+    const _PDCLIB_ctype_t * ctype = _PDCLIB_lconv.ctype;
+
+    while ( ( *s1 ) && ( ctype[(unsigned char)*s1].collation == ctype[(unsigned char)*s2].collation ) )
+    {
+        ++s1;
+        ++s2;
+    }
+    return ( ctype[(unsigned char)*s1].collation == ctype[(unsigned char)*s2].collation );
 }
 
+#endif
+
 #ifdef TEST
-#include <_PDCLIB_test.h>
 
-int main()
+#include "_PDCLIB_test.h"
+
+int main( void )
 {
     char cmpabcde[] = "abcde";
     char empty[] = "";
-    BEGIN_TESTS;
     TESTCASE( strcmp( abcde, cmpabcde ) == 0 );
     TESTCASE( strcmp( abcde, abcdx ) < 0 );
     TESTCASE( strcmp( abcdx, abcde ) > 0 );
@@ -32,4 +39,5 @@ int main()
     TESTCASE( strcmp( abcde, empty ) > 0 );
     return TEST_RESULTS;
 }
+
 #endif