This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH] Cygwin: pty: Fix reopening slave in push_to_pcon_screenbuffer().
- From: Takashi Yano <takashi dot yano at nifty dot ne dot jp>
- To: cygwin-patches at cygwin dot com
- Cc: Takashi Yano <takashi dot yano at nifty dot ne dot jp>
- Date: Tue, 21 Jan 2020 23:41:44 +0900
- Subject: [PATCH] Cygwin: pty: Fix reopening slave in push_to_pcon_screenbuffer().
- Dkim-filter: OpenDKIM Filter v2.10.3 conuserg-05.nifty.com 00LEfp87022724
- For programs compiled with -mwindows option, reopening slave is
needed in push_to_pcon_screenbuffer(), however, it was not at
appropriate place. This causes the problem reported in
https://www.cygwin.com/ml/cygwin/2020-01/msg00161.html. This
patch fixes the issue.
---
winsup/cygwin/fhandler_tty.cc | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index fff5bebe3..b5e7368b0 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1272,9 +1272,21 @@ fhandler_pty_slave::push_to_pcon_screenbuffer (const char *ptr, size_t len)
break;
}
+ int retry_count;
+ retry_count = 0;
DWORD dwMode, flags;
flags = ENABLE_VIRTUAL_TERMINAL_PROCESSING;
- GetConsoleMode (get_output_handle (), &dwMode);
+ while (!GetConsoleMode (get_output_handle (), &dwMode))
+ {
+ termios_printf ("GetConsoleMode failed, %E");
+ /* Re-open handles */
+ this->close ();
+ this->open (0, 0);
+ /* Fix pseudo console window size */
+ this->ioctl (TIOCSWINSZ, &get_ttyp ()->winsize);
+ if (++retry_count > 3)
+ goto cleanup;
+ }
if (!(get_ttyp ()->ti.c_oflag & OPOST) ||
!(get_ttyp ()->ti.c_oflag & ONLCR))
flags |= DISABLE_NEWLINE_AUTO_RETURN;
@@ -1283,8 +1295,6 @@ fhandler_pty_slave::push_to_pcon_screenbuffer (const char *ptr, size_t len)
p = buf;
DWORD wLen, written;
written = 0;
- int retry_count;
- retry_count = 0;
BOOL (WINAPI *WriteFunc)
(HANDLE, LPCVOID, DWORD, LPDWORD, LPOVERLAPPED);
WriteFunc = WriteFile_Orig ? WriteFile_Orig : WriteFile;
@@ -1293,16 +1303,13 @@ fhandler_pty_slave::push_to_pcon_screenbuffer (const char *ptr, size_t len)
if (!WriteFunc (get_output_handle (), p, nlen - written, &wLen, NULL))
{
termios_printf ("WriteFile failed, %E");
- this->open (0, 0); /* Re-open handles */
- /* Fix pseudo console window size */
- struct winsize win;
- this->ioctl (TIOCGWINSZ, &win);
- this->ioctl (TIOCSWINSZ, &win);
- if (++retry_count > 3)
- break;
+ break;
+ }
+ else
+ {
+ written += wLen;
+ p += wLen;
}
- written += wLen;
- p += wLen;
}
/* Detach from pseudo console and resume. */
flags = ENABLE_VIRTUAL_TERMINAL_PROCESSING;
--
2.21.0