X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrcoll.c;h=7c8c1803a9b65c6db78f822e1fd7518fd7908c13;hb=e1c526e9bad3f6e69391e94059096145390508d3;hp=80ecbdff24d4977add1e4a88d85d1f51fb42757a;hpb=0a5395faab237ba9008352b0f4bee9659bbd3d5f;p=pdclib

diff --git a/functions/string/strcoll.c b/functions/string/strcoll.c
index 80ecbdf..7c8c180 100644
--- a/functions/string/strcoll.c
+++ b/functions/string/strcoll.c
@@ -1,14 +1,41 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* strcoll( const char *, const char * )
 
-int strcoll( const char * s1, const char * s2 ) { /* TODO */ };
+   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
 
-/* PDPC code - unreviewed
+#include <_PDCLIB_locale.h>
+
+int strcoll( const char * s1, const char * s2 )
 {
-    return (strcmp(s1, s2));
+    const _PDCLIB_ctype_t * ctype = _PDCLIB_threadlocale()->_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( 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