Libc-1082.20.4.tar.gz

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

diff --git a/locale/FreeBSD/wcstombs.c b/locale/FreeBSD/wcstombs.c
index b798c9e1a5e53df768c355ef6e69f47ca6af0e08..a6d9ae3828d8260f4379a8d3bedd43f532ba89bb 100644 (file)
--- a/locale/FreeBSD/wcstombs.c
+++ b/locale/FreeBSD/wcstombs.c
@@ -25,7 +25,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.10 2004/07/21 10:54:57 tjr Exp $");
+__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>
@@ -33,11 +35,21 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.10 2004/07/21 10:54:57 tj
 #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;
 
+       NORMALIZE_LOCALE(loc);
        mbs = initial;
-       return (__wcsnrtombs(s, &pwcs, SIZE_T_MAX, n, &mbs));
+       pwcsp = pwcs;
+       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());
 }