--- getwchar.c.orig 2004-11-25 11:38:35.000000000 -0800 +++ getwchar.c 2005-02-23 17:30:01.000000000 -0800 @@ -27,6 +27,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/lib/libc/stdio/getwchar.c,v 1.3 2004/05/25 10:42:52 tjr Exp $"); +#include "xlocale_private.h" + #include "namespace.h" #include <stdio.h> #include <wchar.h> @@ -43,5 +45,13 @@ getwchar(void) { - return (fgetwc(stdin)); + return (fgetwc_l(stdin, __current_locale())); +} + +wint_t +getwchar_l(locale_t loc) +{ + + /* no need to call NORMALIZE_LOCALE(loc) because fgetwc_l will */ + return (fgetwc_l(stdin, loc)); }