Libc-825.24.tar.gz

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

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

+#include "xlocale_private.h"
+

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

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

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

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

 }
 }