libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-03-04 14:06:13 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: pty: Fix conditions for input transfer again.

Browse Source
This commit is contained in:
Takashi Yano 2021-12-14 19:20:34 +09:00
parent fd5878021f
commit 54756529d4
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
winsup/cygwin/fhandler_tty.cc
View File

@ -1181,8 +1181,10 @@ fhandler_pty_slave::reset_switch_to_pcon (void)
&& pcon_pid_alive (get_ttyp ()->pcon_pid)) && pcon_pid_alive (get_ttyp ()->pcon_pid))
{ {
/* There is a process which is grabbing pseudo console. */ /* There is a process which is grabbing pseudo console. */
if (!to_be_read_from_pcon () && get_ttyp ()->pcon_activated if (!to_be_read_from_pcon ()
&& get_ttyp ()->pcon_input_state_eq (tty::to_nat)) && get_ttyp ()->pcon_input_state_eq (tty::to_nat))
{
if (get_ttyp ()->pcon_activated)
{ {
HANDLE pcon_owner = HANDLE pcon_owner =
OpenProcess (PROCESS_DUP_HANDLE, FALSE, get_ttyp ()->pcon_pid); OpenProcess (PROCESS_DUP_HANDLE, FALSE, get_ttyp ()->pcon_pid);
@ -1214,6 +1216,15 @@ fhandler_pty_slave::reset_switch_to_pcon (void)
CloseHandle (pcon_owner); CloseHandle (pcon_owner);
} }
} }
else if (!get_ttyp ()->pcon_fg (get_ttyp ()->getpgid ())
&& get_ttyp ()->switch_to_pcon_in)
{
WaitForSingleObject (input_mutex, INFINITE);
transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
input_available_event);
ReleaseMutex (input_mutex);
}
}
ReleaseMutex (pcon_mutex); ReleaseMutex (pcon_mutex);
return; return;
} }
@ -1287,8 +1298,8 @@ fhandler_pty_slave::mask_switch_to_pcon_in (bool mask, bool xfer)
/* This is needed when cygwin-app is started from non-cygwin app if /* This is needed when cygwin-app is started from non-cygwin app if
pseudo console is disabled. */ pseudo console is disabled. */
bool need_xfer = bool need_xfer = get_ttyp ()->pcon_fg (get_ttyp ()->getpgid ())
get_ttyp ()->switch_to_pcon_in && !get_ttyp ()->pcon_activated; && get_ttyp ()->switch_to_pcon_in && !get_ttyp ()->pcon_activated;
/* In GDB, transfer input based on setpgid() does not work because /* In GDB, transfer input based on setpgid() does not work because
GDB may not set terminal process group properly. Therefore, GDB may not set terminal process group properly. Therefore,