Libc-1082.50.1.tar.gz

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

diff --git a/locale/FreeBSD/mbrlen.c b/locale/FreeBSD/mbrlen.c
index 33f7ea02c0b37080deb576dc13d062f59cf57498..2f0227ad977216bdd6819e8983bb5fbca24829fe 100644 (file)
--- a/locale/FreeBSD/mbrlen.c
+++ b/locale/FreeBSD/mbrlen.c
@@ -27,15 +27,23 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
 
+#include "xlocale_private.h"
+
 #include <wchar.h>
 #include "mblocal.h"
 
 size_t
-mbrlen(const char * __restrict s, size_t n, mbstate_t * __restrict ps)
+mbrlen_l(const char * __restrict s, size_t n, mbstate_t * __restrict ps,
+    locale_t loc)
 {
-       static mbstate_t mbs;
-
+       NORMALIZE_LOCALE(loc);
        if (ps == NULL)
-               ps = &mbs;
-       return (__mbrtowc(NULL, s, n, ps));
+               ps = &loc->__mbs_mbrlen;
+       return (loc->__lc_ctype->__mbrtowc(NULL, s, n, ps, loc));
+}
+
+size_t
+mbrlen(const char * __restrict s, size_t n, mbstate_t * __restrict ps)
+{
+       return mbrlen_l(s, n, ps, __current_locale());
 }