Libc-1082.20.4.tar.gz

[apple/libc.git] / locale / FreeBSD / wcsrtombs.c

diff --git a/locale/FreeBSD/wcsrtombs.c b/locale/FreeBSD/wcsrtombs.c
index 61e5432de749b18eb09e55fdf53ce45224ca0044..483b862b7184c0f2aef2739877b770b6c559dcdc 100644 (file)
--- a/locale/FreeBSD/wcsrtombs.c
+++ b/locale/FreeBSD/wcsrtombs.c
@@ -27,19 +27,27 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
 

+#include "xlocale_private.h"
+

 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
 #include "mblocal.h"
 
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
 #include "mblocal.h"
 

+size_t
+wcsrtombs_l(char * __restrict dst, const wchar_t ** __restrict src, size_t len,
+    mbstate_t * __restrict ps, locale_t loc)
+{
+       NORMALIZE_LOCALE(loc);
+       if (ps == NULL)
+               ps = &loc->__mbs_wcsrtombs;
+       return (loc->__lc_ctype->__wcsnrtombs(dst, src, SIZE_T_MAX, len, ps, loc));
+}
+

 size_t
 wcsrtombs(char * __restrict dst, const wchar_t ** __restrict src, size_t len,
     mbstate_t * __restrict ps)
 {
 size_t
 wcsrtombs(char * __restrict dst, const wchar_t ** __restrict src, size_t len,
     mbstate_t * __restrict ps)
 {

-       static mbstate_t mbs;
-
-       if (ps == NULL)
-               ps = &mbs;
-       return (__wcsnrtombs(dst, src, SIZE_T_MAX, len, ps));
+       return wcsrtombs_l(dst, src, len, ps, __current_locale());

 }
 }