--- btowc.c.orig Thu Nov 25 11:38:16 2004 +++ btowc.c Fri Feb 18 15:58:50 2005 @@ -27,18 +27,21 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/lib/libc/locale/btowc.c,v 1.4 2004/05/12 14:26:54 tjr Exp $"); +#include "xlocale_private.h" + #include <stdio.h> #include <wchar.h> #include "mblocal.h" wint_t -btowc(int c) +btowc_l(int c, locale_t loc) { static const mbstate_t initial; mbstate_t mbs = initial; char cc; wchar_t wc; + NORMALIZE_LOCALE(loc); if (c == EOF) return (WEOF); /* @@ -47,7 +50,13 @@ * counts. */ cc = (char)c; - if (__mbrtowc(&wc, &cc, 1, &mbs) > 1) + if (loc->__lc_ctype->__mbrtowc(&wc, &cc, 1, &mbs, loc) > 1) return (WEOF); return (wc); +} + +wint_t +btowc(int c) +{ + return btowc_l(c, __current_locale()); }