Moving branches closer together.

[pdclib] / functions / string / strxfrm.c

diff --git a/functions/string/strxfrm.c b/functions/string/strxfrm.c
index 4b81c9375c624f47b50329b8ed16abf8fbd678b0..c17d867f6381c4dc235d4670047fbf38eeaf8977 100644 (file)
--- a/functions/string/strxfrm.c
+++ b/functions/string/strxfrm.c
@@ -1,28 +1,25 @@
-/* $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>
 
 #ifndef REGTEST
 
-/* TODO: Dummy function, no locale support yet. */
+#include <locale.h>
+
 size_t strxfrm( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
 {
+    const _PDCLIB_ctype_t * ctype = _PDCLIB_lconv.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;
 }
@@ -30,12 +27,12 @@ size_t strxfrm( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
 
-int main()
+#include "_PDCLIB_test.h"
+
+int main( void )
 {
     char s[] = "xxxxxxxxxxx";
-    BEGIN_TESTS;
     TESTCASE( strxfrm( NULL, "123456789012", 0 ) == 12 );
     TESTCASE( strxfrm( s, "123456789012", 12 ) == 12 );
     /*
@@ -48,5 +45,5 @@ int main()
     TESTCASE( s[10] == '\0' );
     return TEST_RESULTS;
 }
-#endif
 
+#endif