From: Waldemar Kozaczuk <[email protected]> Committer: Waldemar Kozaczuk <[email protected]> Branch: master
libc: replace locale/strxfrm*.c (from old musl) with musl copy of locale/strxfrm.c Signed-off-by: Waldemar Kozaczuk <[email protected]> Message-Id: <[email protected]> --- diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1052,8 +1052,7 @@ musl += locale/strncasecmp_l.o libc += locale/strtod_l.o libc += locale/strtof_l.o libc += locale/strtold_l.o -libc += locale/strxfrm.o -libc += locale/strxfrm_l.o +musl += locale/strxfrm.o musl += locale/tolower_l.o musl += locale/toupper_l.o musl += locale/towctrans_l.o diff --git a/libc/locale/strxfrm.c b/libc/locale/strxfrm.c --- a/libc/locale/strxfrm.c +++ b/libc/locale/strxfrm.c @@ -1,9 +0,0 @@ -#include <string.h> - -/* collate only by code points */ -size_t strxfrm(char *restrict dest, const char *restrict src, size_t n) -{ - size_t l = strlen(src); - if (n > l) strcpy(dest, src); - return l; -} diff --git a/libc/locale/strxfrm_l.c b/libc/locale/strxfrm_l.c --- a/libc/locale/strxfrm_l.c +++ b/libc/locale/strxfrm_l.c @@ -1,10 +0,0 @@ -#include <string.h> -#include "libc.h" - -size_t __strxfrm_l(char *restrict dest, const char *restrict src, size_t n, locale_t l) -{ - return strxfrm(dest, src, n); -} - -/* OSv local: a libstdc++ build against glibc wants the __ version */ -weak_alias(__strxfrm_l, strxfrm_l); -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/000000000000758a4905ad476bf7%40google.com.
