From 6f401eccfb260b64a35a55e54e0e403324921690 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 14 May 2009 19:49:37 +0000 Subject: * cygheap.cc (cygheap_init): Set Cygwin default locale values. * cygheap.h (struct cygheap_locale): New structure. (struct user_heap_info): Add cygheap_locale member locale. * dcrt0.cc (dll_crt0_1): Revert to calling _setlocale_r so that only the applications locale is reverted to "C". * environ.cc (environ_init): Remove unused got_lc variable. * fhandler.h (class dev_console): Remove now unsed locale variables. * fhandler_console.cc (fhandler_console::get_tty_stuff): Remove setting dev_console's locale members. (dev_console::con_to_str): Use internal locale settings. Default to __ascii_wctomb if charset is "ASCII". (fhandler_console::write_normal): Ditto. * strfuncs.cc (__ascii_wctomb): Drop declaration. (__db_wctomb): Use fixed value 2 instead of not necessarily matching MB_CUR_MAX. (__eucjp_wctomb): Use 3 instead of MB_CUR_MAX. (sys_cp_wcstombs): Remove special case for "C" locale. (sys_wcstombs): Implement here. Use internal locale data stored on cygheap. (sys_cp_mbstowcs): Remove special case for "C" locale. (sys_mbstowcs): Implement here. Use internal locale data stored on cygheap. * syscalls.cc (internal_setlocale): New function to set cygheap locale data and to reset CWD posix path. (setlocale): Just call internal_setlocale from here if necessary. * wchar.h (__ascii_wctomb): Declare. (sys_wcstombs): Don't define inline, just declare. (sys_mbstowcs): Ditto. --- winsup/cygwin/cygheap.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'winsup/cygwin/cygheap.h') diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h index 0932f865d..2c878f0c9 100644 --- a/winsup/cygwin/cygheap.h +++ b/winsup/cygwin/cygheap.h @@ -258,6 +258,13 @@ struct cygheap_debug }; #endif +struct cygheap_locale +{ + mbtowc_p mbtowc; + wctomb_p wctomb; + char charset[ENCODING_LEN + 1]; +}; + struct user_heap_info { void *base; @@ -281,6 +288,7 @@ struct init_cygheap char *buckets[32]; cygheap_root root; cygheap_user user; + cygheap_locale locale; user_heap_info user_heap; mode_t umask; HANDLE console_h; -- cgit v1.2.3