[PATCH] No codepage translation in cygwin console

[Dennis Vshivkov]

    Hello.

    There are times when it's very convenient to change Windows console
codepage using chcp.com, for example, an interactive ssh session to a host
with a different codepage used.  Unfortunately, the current release of cygwin
enforces either of the two main codepages, ansi or oem, to be used, mainly
because of considerations of their importance for filename and clipboard
conversions, etc.  There's a patch attached, it extends functionality of the
`codepage' option, set in CYGWIN environment variable, to allow for setting no
codepage translation of console input and output.

    The way the option should look now is

    codepage=ansi|oem[:con-asis]

    If con-asis suboption is specified, console input and output goes
unchanged.  Hope this helps someone.

-- 
/Awesome Walrus <walrus@amur.ru>
-------------- next part --------------
2002-01-15  Awesome Walrus  <walrus@amur.ru>

	* winsup/cygwin:
	    dcrt0.cc (console_asis),
	    environ.cc (codepage_init),
	    fhandler_console.cc (cp_convert),
	    winsup.h (console_asis):
	  allow for no codepage translation in cygwin console using
	  :con-asis suboption of CYGWIN env variable's codepage= part
-------------- next part --------------
diff -ur cygwin-1.3.6-6.orig/winsup/cygwin/dcrt0.cc cygwin-1.3.6-6/winsup/cygwin/dcrt0.cc
--- cygwin-1.3.6-6.orig/winsup/cygwin/dcrt0.cc	Sun Dec  2 18:54:02 2001
+++ cygwin-1.3.6-6/winsup/cygwin/dcrt0.cc	Tue Jan 15 16:18:23 2002
@@ -58,6 +58,7 @@
 BOOL strip_title_path;
 BOOL allow_glob = TRUE;
 codepage_type current_codepage = ansi_cp;
+BOOL console_asis = FALSE;
 
 int cygwin_finished_initializing;
 
diff -ur cygwin-1.3.6-6.orig/winsup/cygwin/environ.cc cygwin-1.3.6-6/winsup/cygwin/environ.cc
--- cygwin-1.3.6-6.orig/winsup/cygwin/environ.cc	Thu Nov  1 00:30:03 2001
+++ cygwin-1.3.6-6/winsup/cygwin/environ.cc	Tue Jan 15 16:18:23 2002
@@ -449,12 +449,24 @@
   if (!buf || !*buf)
     return;
 
-  if (strcmp (buf, "oem")== 0)
+  const char *colon = strchr(buf, ':');
+  if (colon)
+    {
+      if (strcmp(colon + 1, "con-asis") != 0)
+	{
+	  debug_printf ("Wrong codepage suboption: %s", colon + 1);
+	  return;
+	}
+
+      console_asis = TRUE;
+    }
+
+  if (strncmp(buf, "oem", colon ? colon - buf : sizeof("oem") - 1) == 0)
     {
       current_codepage = oem_cp;
       set_file_api_mode (current_codepage);
     }
-  else if (strcmp (buf, "ansi")== 0)
+  else if (strncmp(buf, "ansi", colon ? colon - buf : sizeof("ansi") - 1) == 0)
     {
       current_codepage = ansi_cp;
       set_file_api_mode (current_codepage);
diff -ur cygwin-1.3.6-6.orig/winsup/cygwin/fhandler_console.cc cygwin-1.3.6-6/winsup/cygwin/fhandler_console.cc
--- cygwin-1.3.6-6.orig/winsup/cygwin/fhandler_console.cc	Sun Dec  2 18:54:02 2001
+++ cygwin-1.3.6-6/winsup/cygwin/fhandler_console.cc	Tue Jan 15 16:18:23 2002
@@ -47,7 +47,7 @@
 {
   if (!size)
     /* no action */;
-  else if (destcp == srccp)
+  else if (console_asis || destcp == srccp)
     {
       if (dest != src)
 	memcpy (dest, src, size);
diff -ur cygwin-1.3.6-6.orig/winsup/cygwin/winsup.h cygwin-1.3.6-6/winsup/cygwin/winsup.h
--- cygwin-1.3.6-6.orig/winsup/cygwin/winsup.h	Sun Dec  2 19:52:10 2001
+++ cygwin-1.3.6-6/winsup/cygwin/winsup.h	Tue Jan 15 16:18:23 2002
@@ -74,6 +74,7 @@
 
 enum codepage_type {ansi_cp, oem_cp};
 extern codepage_type current_codepage;
+extern BOOL console_asis;
 
 /* Used to check if Cygwin DLL is dynamically loaded. */
 extern int dynamically_loaded;