- This patch fixes the issue that xterm compatible mode for input
is not correctly set/unset in some situation such as:
1) cat is stopped by ctrl-c.
2) The window size is changed in less.
In case 1), request_xterm_mode_input(true) is called in read(),
however, cat is stopped without request_xterm_mode_input(false).
In case 2), less uses longjmp in signal handler, therefore,
corresponding request_xterm_mode_input(false) is not called if
the SIGWINCH signal is sent within read(). With this patch,
InterlockedExchange() is used instead of InterlockedIncrement/
Decrement().
---
winsup/cygwin/fhandler_console.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/fhandler_console.cc
b/winsup/cygwin/fhandler_console.cc
index 7c97a7868..9c5b80181 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -267,7 +267,7 @@ fhandler_console::request_xterm_mode_input (bool req)
return;
if (req)
{
- if (InterlockedIncrement (&con.xterm_mode_input) == 1)
+ if (InterlockedExchange (&con.xterm_mode_input, 1) == 0)
{
DWORD dwMode;
GetConsoleMode (get_handle (), &dwMode);
@@ -277,7 +277,7 @@ fhandler_console::request_xterm_mode_input (bool req)
}
else
{
- if (InterlockedDecrement (&con.xterm_mode_input) == 0)
+ if (InterlockedExchange (&con.xterm_mode_input, 0) == 1)
{
DWORD dwMode;
GetConsoleMode (get_handle (), &dwMode);
@@ -1171,6 +1171,7 @@ fhandler_console::close ()
if ((NT_SUCCESS (status) && obi.HandleCount == 1)
|| myself->pid == con.owner)
request_xterm_mode_output (false);
+ request_xterm_mode_input (false);
}
release_output_mutex ();
--
2.21.0
