summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Yano via Cygwin-patches <cygwin-patches@cygwin.com>2021-01-28 12:26:12 +0900
committerCorinna Vinschen <corinna@vinschen.de>2021-01-28 11:21:12 +0100
commit442093214dd6b911a3a0080a10904587733a581f (patch)
treed9a4529fb9692cff52c6256f9a520c011d922810
parent10d083c745dd89e824adc960d555975afc26b785 (diff)
downloadcygnal-442093214dd6b911a3a0080a10904587733a581f.tar.gz
cygnal-442093214dd6b911a3a0080a10904587733a581f.tar.bz2
cygnal-442093214dd6b911a3a0080a10904587733a581f.zip
Cygwin: pty: Keep code page between non-cygwin apps.
- After commit bb428520, there has been the disadvantage: 4) Code page cannot be changed by chcp.com. Acctually, chcp works itself and changes code page of its own pseudo console. However, since pseudo console is recreated for another process, it cannot inherit the code page. This patch clears this disadvantage.
-rw-r--r--winsup/cygwin/fhandler_tty.cc7
-rw-r--r--winsup/cygwin/tty.cc2
-rw-r--r--winsup/cygwin/tty.h2
3 files changed, 11 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index f0b2cd60a..34cff2ae5 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2845,6 +2845,11 @@ fhandler_pty_slave::setup_pseudoconsole (bool nopcon)
HPCON_INTERNAL *hp = (HPCON_INTERNAL *) get_ttyp ()->h_pseudo_console;
get_ttyp ()->h_pcon_write_pipe = hp->hWritePipe;
}
+
+ if (get_ttyp ()->previous_code_page)
+ SetConsoleCP (get_ttyp ()->previous_code_page);
+ if (get_ttyp ()->previous_output_code_page)
+ SetConsoleOutputCP (get_ttyp ()->previous_output_code_page);
return true;
cleanup_pcon_in:
@@ -2884,6 +2889,8 @@ fhandler_pty_slave::close_pseudoconsole (tty *ttyp)
if (ttyp->h_pseudo_console)
{
ttyp->wait_pcon_fwd ();
+ ttyp->previous_code_page = GetConsoleCP ();
+ ttyp->previous_output_code_page = GetConsoleOutputCP ();
FreeConsole ();
AttachConsole (ATTACH_PARENT_PROCESS);
HPCON_INTERNAL *hp = (HPCON_INTERNAL *) ttyp->h_pseudo_console;
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index 436f5c6c3..908166a37 100644
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -246,6 +246,8 @@ tty::init ()
has_csi6n = false;
need_invisible_console = false;
invisible_console_pid = 0;
+ previous_code_page = 0;
+ previous_output_code_page = 0;
}
HANDLE
diff --git a/winsup/cygwin/tty.h b/winsup/cygwin/tty.h
index eb604588c..061357437 100644
--- a/winsup/cygwin/tty.h
+++ b/winsup/cygwin/tty.h
@@ -107,6 +107,8 @@ private:
bool has_csi6n;
bool need_invisible_console;
pid_t invisible_console_pid;
+ UINT previous_code_page;
+ UINT previous_output_code_page;
public:
HANDLE from_master () const { return _from_master; }