X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fstring%2Fstrxfrm.c;h=3692257b234f1fa02e42297ec0749390f6bc5f2f;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hp=650cfbf2ed3c48fccbbc84945e64e5a7d72a56a7;hpb=2f57d79a5a24856fdea69b2119d67e5fb5029b3e;p=pdclib

diff --git a/functions/string/strxfrm.c b/functions/string/strxfrm.c
index 650cfbf..3692257 100644
--- a/functions/string/strxfrm.c
+++ b/functions/string/strxfrm.c
@@ -1,38 +1,37 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
 /* strxfrm( char *, const char *, size_t )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#include <_PDCLIB_aux.h>
 #include <string.h>
 
-/* TODO: Dummy function, no locale support yet. */
+#ifndef REGTEST
+
+#include "_PDCLIB_locale.h"
 
 size_t strxfrm( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
 {
+    const _PDCLIB_ctype_t *ctype = _PDCLIB_threadlocale()->_CType;
     size_t len = strlen( s2 );
     if ( len < n )
     {
         /* Cannot use strncpy() here as the filling of s1 with '\0' is not part
            of the spec.
         */
-        while ( n-- && ( *s1++ = *s2++ ) );
+        while ( n-- && ( *s1++ = ctype[(unsigned char)*s2++].collation ) );
     }
     return len;
 }
 
+#endif
+
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
-int main()
+int main( void )
 {
     char s[] = "xxxxxxxxxxx";
-    BEGIN_TESTS;
     TESTCASE( strxfrm( NULL, "123456789012", 0 ) == 12 );
     TESTCASE( strxfrm( s, "123456789012", 12 ) == 12 );
     /*