X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Flocale%2Fwcsxfrm.c;h=0a0b776dadf46aa65c91303dd43776b22c158679;hb=bc42dcbfd9466c22d8ab0f8235e5091689a95aad;hp=cb79c97e79efdde4b0394db68c90e210950470bb;hpb=1ae4bc42808111d6b3f50c063de102f162051986;p=musl

diff --git a/src/locale/wcsxfrm.c b/src/locale/wcsxfrm.c
index cb79c97e..0a0b776d 100644
--- a/src/locale/wcsxfrm.c
+++ b/src/locale/wcsxfrm.c
@@ -1,21 +1,24 @@
 #include <wchar.h>
 #include <locale.h>
+#include "locale_impl.h"
 #include "libc.h"
 
 /* collate only by code points */
 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) {
+	if (l < n) {
+		wmemcpy(dest, src, l+1);
+	} else if (n) {
 		wmemcpy(dest, src, n-1);
 		dest[n-1] = 0;
-	} 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, 0);
+	return __wcsxfrm_l(dest, src, n, CURRENT_LOCALE);
 }
 
 weak_alias(__wcsxfrm_l, wcsxfrm_l);