Libc-1158.1.2.tar.gz

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

diff --git a/locale/FreeBSD/wcstombs.c b/locale/FreeBSD/wcstombs.c
index c7d5b67a739a2a85b409f7e62972210616b5e064..a6d9ae3828d8260f4379a8d3bedd43f532ba89bb 100644 (file)
--- a/locale/FreeBSD/wcstombs.c
+++ b/locale/FreeBSD/wcstombs.c
@@ -27,19 +27,29 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.11 2009/01/15 18:53:52 rdivacky Exp $");
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.11 2009/01/15 18:53:52 rdivacky Exp $");
 

+#include "xlocale_private.h"
+

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

-wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n)
+wcstombs_l(char * __restrict s, const wchar_t * __restrict pwcs, size_t n,
+    locale_t loc)

 {
        static const mbstate_t initial;
        mbstate_t mbs;
        const wchar_t *pwcsp;
 
 {
        static const mbstate_t initial;
        mbstate_t mbs;
        const wchar_t *pwcsp;
 

+       NORMALIZE_LOCALE(loc);

        mbs = initial;
        pwcsp = pwcs;
        mbs = initial;
        pwcsp = pwcs;

-       return (__wcsnrtombs(s, &pwcsp, SIZE_T_MAX, n, &mbs));
+       return (loc->__lc_ctype->__wcsnrtombs(s, &pwcsp, SIZE_T_MAX, n, &mbs, loc));
+}
+
+size_t
+wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n)
+{
+       return wcstombs_l(s, pwcs, n, __current_locale());

 }
 }