* 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.

1 files changed, 16 insertions, 10 deletions

diff --git a/winsup/cygwin/strfuncs.cc b/winsup/cygwin/strfuncs.cc
index a97f942d2..130be76f1 100644
--- a/winsup/cygwin/strfuncs.cc
+++ b/winsup/cygwin/strfuncs.cc
@@ -22,20 +22,26 @@ details. */
 #include "cygheap.h"
 
 codepage_type current_codepage = ansi_cp;
+UINT active_codepage = 0;
+
+#ifdef __OUTSIDE_CYGWIN__
+#define codepage_init(cp)	(active_codepage = GetACP ())
+#endif
 
 UINT
 get_cp ()
 {
-  switch (current_codepage)
-    {
-      case oem_cp:
-	return GetOEMCP ();
-      case utf8_cp:
-	return CP_UTF8;
-      case ansi_cp:
-      default:
-	return GetACP ();
-    }
+  if (!active_codepage)
+    codepage_init ("ansi");
+  return active_codepage;
+}
+
+bool
+is_cp_multibyte (UINT cp)
+{
+  CPINFO cpi; 
+  GetCPInfo (cp, &cpi);
+  return cpi.MaxCharSize > 1;
 }
 
 /* tlen is always treated as the maximum buffer size, including the '\0'