public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: console: Fix restoring console mode failure. Date: Fri, 5 Mar 2021 15:12:07 +0000 (GMT) [thread overview] Message-ID: <20210305151207.7004C3848000@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=5cf99d2f6e09d44b26499f8f73ea0a2146e98180 commit 5cf99d2f6e09d44b26499f8f73ea0a2146e98180 Author: Takashi Yano via Cygwin-patches <cygwin-patches@cygwin.com> Date: Thu Mar 4 19:11:08 2021 +0900 Cygwin: console: Fix restoring console mode failure. - Restoring console mode fails in the following scenario. 1) Start cygwin shell in command prompt. 2) Run 'exec chcp.com'. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler.h | 1 + winsup/cygwin/spawn.cc | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index ad90cf33d..9b85d1ee9 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -2251,6 +2251,7 @@ private: const handle_set_t *p); static void cons_master_thread (handle_set_t *p, tty *ttyp); + pid_t get_owner (void) { return shared_console_info->con.owner; } friend tty_min * tty_list::get_cttyp (); }; diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 323630fcb..9d70cb2b7 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -608,6 +608,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, fhandler_pty_slave *ptys_primary = NULL; fhandler_console *cons_native = NULL; termios *cons_ti = NULL; + pid_t cons_owner = 0; for (int i = 0; i < 3; i ++) { const int chk_order[] = {1, 0, 2}; @@ -628,6 +629,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, { cons_native = cons; cons_ti = &((tty *)cons->tc ())->ti; + cons_owner = cons->get_owner (); } if (fd == 0) fhandler_console::set_input_mode (tty::native, @@ -1000,9 +1002,11 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, } if (cons_native) { - fhandler_console::set_output_mode (tty::cygwin, cons_ti, + tty::cons_mode conmode = + cons_owner == myself->pid ? tty::restore : tty::cygwin; + fhandler_console::set_output_mode (conmode, cons_ti, &cons_handle_set); - fhandler_console::set_input_mode (tty::cygwin, cons_ti, + fhandler_console::set_input_mode (conmode, cons_ti, &cons_handle_set); fhandler_console::close_handle_set (&cons_handle_set); } @@ -1035,9 +1039,11 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, } if (cons_native) { - fhandler_console::set_output_mode (tty::cygwin, cons_ti, + tty::cons_mode conmode = + cons_owner == myself->pid ? tty::restore : tty::cygwin; + fhandler_console::set_output_mode (conmode, cons_ti, &cons_handle_set); - fhandler_console::set_input_mode (tty::cygwin, cons_ti, + fhandler_console::set_input_mode (conmode, cons_ti, &cons_handle_set); fhandler_console::close_handle_set (&cons_handle_set); }
reply other threads:[~2021-03-05 15:12 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210305151207.7004C3848000@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).