From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 7004C3848000; Fri, 5 Mar 2021 15:12:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7004C3848000 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: console: Fix restoring console mode failure. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano via Cygwin-patches X-Git-Refname: refs/heads/master X-Git-Oldrev: 919dea66d3ca17eac4aa08d4156516feb165ec82 X-Git-Newrev: 5cf99d2f6e09d44b26499f8f73ea0a2146e98180 Message-Id: <20210305151207.7004C3848000@sourceware.org> Date: Fri, 5 Mar 2021 15:12:07 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Mar 2021 15:12:07 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=5cf99d2f6e09d44b26499f8f73ea0a2146e98180 commit 5cf99d2f6e09d44b26499f8f73ea0a2146e98180 Author: Takashi Yano via Cygwin-patches 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); }