update strxfrm/wcsxfrm for future LC_COLLATE support and ABI compat

diff --git a/src/locale/strxfrm.c b/src/locale/strxfrm.c
index d40be9e132a3d9898c698d9991779af3813f4ac3..0ca9b0711b24e33c6a387686fe63732fd9e6c186 100644 (file)
--- a/src/locale/strxfrm.c
+++ b/src/locale/strxfrm.c
@@ -1,9 +1,18 @@
 #include <string.h>
+#include <locale.h>
+#include "libc.h"
 
 /* collate only by code points */
-size_t strxfrm(char *restrict dest, const char *restrict src, size_t n)
+size_t __strxfrm_l(char *restrict dest, const char *restrict src, size_t n, locale_t loc)
 {
        size_t l = strlen(src);
        if (n > l) strcpy(dest, src);
        return l;
 }
+
+size_t strxfrm(char *restrict dest, const char *restrict src, size_t n)
+{
+       return __strxfrm_l(dest, src, n, LC_GLOBAL_LOCALE);
+}
+
+weak_alias(__strxfrm_l, strxfrm_l);

diff --git a/src/locale/strxfrm_l.c b/src/locale/strxfrm_l.c
deleted file mode 100644 (file)
index 81a7bad..0000000
--- a/src/locale/strxfrm_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <string.h>
-
-size_t strxfrm_l(char *restrict dest, const char *restrict src, size_t n, locale_t l)
-{
-       return strxfrm(dest, src, n);
-}

diff --git a/src/locale/wcsxfrm.c b/src/locale/wcsxfrm.c
index bfa01b5b34749eb93a3e22ce0860ba91143774d4..f977f9e19a50bd1acd6b9be5361cb5135e090eb4 100644 (file)
--- a/src/locale/wcsxfrm.c
+++ b/src/locale/wcsxfrm.c
@@ -1,7 +1,9 @@
 #include <wchar.h>
+#include <locale.h>
+#include "libc.h"
 
 /* collate only by code points */
-size_t wcsxfrm(wchar_t *restrict dest, const wchar_t *restrict src, size_t n)
+size_t __wcsxfrm_l(wchar_t *restrict dest, const wchar_t *restrict src, size_t n, locale_t loc)
 {
        size_t l = wcslen(src);
        if (l >= n) {
@@ -10,3 +12,10 @@ size_t wcsxfrm(wchar_t *restrict dest, const wchar_t *restrict src, size_t n)
        } else wcscpy(dest, src);
        return l;
 }
+
+size_t wcsxfrm(wchar_t *restrict dest, const wchar_t *restrict src, size_t n)
+{
+       return __wcsxfrm_l(dest, src, n, LC_GLOBAL_LOCALE);
+}
+
+weak_alias(__wcsxfrm_l, wcsxfrm_l);

diff --git a/src/locale/wcsxfrm_l.c b/src/locale/wcsxfrm_l.c
deleted file mode 100644 (file)
index 66a0019..0000000
--- a/src/locale/wcsxfrm_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wchar.h>
-
-size_t wcsxfrm_l(wchar_t *restrict dest, const wchar_t *restrict src, size_t n, locale_t locale)
-{
-       return wcsxfrm(dest, src, n);
-}