libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Takashi Yano via Cygwin-patches 2021-03-04 19:11:08 +09:00 committed by Corinna Vinschen
parent 919dea66d3
commit 5cf99d2f6e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/cygwin/fhandler.h
View File

@ -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 ();
};

14
winsup/cygwin/spawn.cc
View File

@ -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);
}