diff options
author | tjr <tjr@FreeBSD.org> | 2003-12-08 23:52:22 +0000 |
---|---|---|
committer | tjr <tjr@FreeBSD.org> | 2003-12-08 23:52:22 +0000 |
commit | f9c332bd6adec0361d112a86754f619197f5d380 (patch) | |
tree | b8626521156fc0bf40855c547bfd69a14b8cb874 /lib/libc | |
parent | 77b35b849fdc2e40271608172cbabba58164183e (diff) | |
download | FreeBSD-src-f9c332bd6adec0361d112a86754f619197f5d380.zip FreeBSD-src-f9c332bd6adec0361d112a86754f619197f5d380.tar.gz |
Set __mbrtowc and __wcrtomb correctly when changing to the C/POSIX locale.
Save __mbrtowc and __wcrtomb and restore them when changing back to
the cached locale.
Reported by: perky
Diffstat (limited to 'lib/libc')
-rw-r--r-- | lib/libc/locale/setrunelocale.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c index 43b759a..165f877 100644 --- a/lib/libc/locale/setrunelocale.c +++ b/lib/libc/locale/setrunelocale.c @@ -71,6 +71,10 @@ extern size_t __emulated_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict ps); extern rune_t __emulated_sgetrune(const char *, size_t, const char **); extern int __emulated_sputrune(rune_t, char *, size_t, char **); +extern size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, + size_t, mbstate_t * __restrict); +extern size_t _none_wcrtomb(char * __restrict, wchar_t, + mbstate_t * __restrict); static int __setrunelocale(const char *); @@ -104,6 +108,10 @@ __setrunelocale(const char *encoding) static char ctype_encoding[ENCODING_LEN + 1]; static _RuneLocale *CachedRuneLocale; static int Cached__mb_cur_max; + static size_t (*Cached__mbrtowc)(wchar_t * __restrict, + const char * __restrict, size_t, mbstate_t * __restrict); + static size_t (*Cached__wcrtomb)(char * __restrict, wchar_t, + mbstate_t * __restrict); /* * The "C" and "POSIX" locale are always here. @@ -111,6 +119,8 @@ __setrunelocale(const char *encoding) if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) { _CurrentRuneLocale = &_DefaultRuneLocale; __mb_cur_max = 1; + __mbrtowc = _none_mbrtowc; + __wcrtomb = _none_wcrtomb; return (0); } @@ -121,6 +131,8 @@ __setrunelocale(const char *encoding) strcmp(encoding, ctype_encoding) == 0) { _CurrentRuneLocale = CachedRuneLocale; __mb_cur_max = Cached__mb_cur_max; + __mbrtowc = Cached__mbrtowc; + __wcrtomb = Cached__wcrtomb; return (0); } @@ -177,6 +189,8 @@ __setrunelocale(const char *encoding) } CachedRuneLocale = _CurrentRuneLocale; Cached__mb_cur_max = __mb_cur_max; + Cached__mbrtowc = __mbrtowc; + Cached__wcrtomb = __wcrtomb; (void)strcpy(ctype_encoding, encoding); } else free(rl); |