JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: console: Add guard for set/unset xterm compatible mode.

Browse Source 
- Setting / unsetting xterm compatible mode may cause race issue
  between multiple processes. This patch adds guard for that.
This commit is contained in:
Takashi Yano
2020-02-18 18:12:54 +09:00
committed by Corinna Vinschen
parent 321d79abd3
commit 81b3440998
4 changed files with 103 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
winsup/cygwin/select.cc
View File

@@ -1075,17 +1075,16 @@ verify_console (select_record *me, fd_set *rfds, fd_set *wfds,
return peek_console (me, true);
}
static void console_cleanup (select_record *, select_stuff *);
static int
console_startup (select_record *me, select_stuff *stuff)
{
select_record *s = stuff->start.next;
fhandler_console *fh = (fhandler_console *) me->fh;
if (wincap.has_con_24bit_colors ())
{
DWORD dwMode;
GetConsoleMode (s->h, &dwMode);
/* Enable xterm compatible mode in input */
dwMode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
SetConsoleMode (s->h, dwMode);
fh->request_xterm_mode_input (true);
me->cleanup = console_cleanup;
}
return 1;
}
@@ -1093,15 +1092,9 @@ console_startup (select_record *me, select_stuff *stuff)
static void
console_cleanup (select_record *me, select_stuff *stuff)
{
select_record *s = stuff->start.next;
fhandler_console *fh = (fhandler_console *) me->fh;
if (wincap.has_con_24bit_colors ())
{
DWORD dwMode;
GetConsoleMode (s->h, &dwMode);
/* Disable xterm compatible mode in input */
dwMode &= ~ENABLE_VIRTUAL_TERMINAL_INPUT;
SetConsoleMode (s->h, dwMode);
}
fh->request_xterm_mode_input (false);
}
select_record *
@@ -1117,7 +1110,6 @@ fhandler_console::select_read (select_stuff *ss)
s->peek = peek_console;
s->h = get_handle ();
s->cleanup = console_cleanup;
s->read_selected = true;
s->read_ready = input_ready || get_cons_readahead_valid ();
return s;