From a7197550f31c8db32c671bc43401c1b90c78ed74 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 5 Feb 2008 17:37:10 +0000 Subject: * autoload.cc (CharToOemA): Remove. (CharNextExA): Define. * environ.cc (codepage_init): Un-static. Set active_codepage to active codepage. Default to ansi regardless of buf pointer. * fhandler.h (dev_console::get_console_cp): New method. (dev_console::con_to_str): Change declaration according to new implementation. (dev_console::str_to_con): Ditto. * fhandler_console.cc (cp_convert): Remove. (dev_console::con_to_str): Redefine to take WCHAR as incoming console char. (dev_console::get_console_cp): Return correct codepage according to alternate_charset_active setting. (dev_console::str_to_con): Redefine to create WCHAR buffer for console output. (fhandler_console::read): Read console input as WCHARs. (base_chars): Fix typo in comment. (fhandler_console::char_command): Save and restore console output buffer using UNICODE functions. (fhandler_console::write_normal): Convert to write output in UNICODE. Use CharNextExA to recognize multibyte characters in input. Workaround problem with UTF-8 and MultiByteToWideChar. Simplify the loop for printing "normal" characters. * strfuncs.cc (active_codepage): New variable to store active codepage. (get_cp): Call codepage_init() if active_codepage is uninitialized. Just return active_codepage. (is_cp_multibyte): New function. * winsup.h (active_codepage): Declare. (codepage_init): Declare. (is_cp_multibyte): Declare. --- winsup/cygwin/winsup.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'winsup/cygwin/winsup.h') diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index 505326cec..f88f23fab 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -112,8 +112,11 @@ extern "C" DWORD WINAPI GetLastError (void); enum codepage_type {ansi_cp, oem_cp, utf8_cp}; extern codepage_type current_codepage; +extern UINT active_codepage; +void codepage_init (const char *buf); UINT get_cp (); +bool is_cp_multibyte (UINT cp); /* Used as type by sys_wcstombs_alloc and sys_mbstowcs_alloc. For a description see there. */ -- cgit v1.2.3