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: pty: Fix error handling of master write(). 

- Currently, error handling of write() in pty master side is broken.
  This patch fixes that.
This commit is contained in:
Takashi Yano 2021-09-07 19:27:45 +09:00 committed by Corinna Vinschen
parent 522cdab541
commit b52f10c4ca
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
winsup/cygwin/fhandler_termios.cc
View File

@ -308,12 +308,12 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti,
int input_done = 0;
bool sawsig = false;
int iscanon = ti.c_lflag & ICANON;
size_t read_cnt = 0;
if (bytes_read)
*bytes_read = nread;
while (nread-- > 0)
while (read_cnt < nread)
{
c = *rptr++;
read_cnt++;
paranoid_printf ("char %0o", c);
@ -453,7 +453,6 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti,
if (status != 1)
{
ret = status ? line_edit_error : line_edit_pipe_full;
nread += ralen ();
break;
}
ret = line_edit_input_done;
@ -462,22 +461,21 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti,
}
/* If we didn't write all bytes in non-canonical mode, write them now. */
if (!iscanon && ralen () > 0
&& (ret == line_edit_ok || ret == line_edit_input_done))
if ((input_done || !iscanon) && ralen () > 0 && ret != line_edit_error)
{
int status = accept_input ();
int status;
int retry_count = 3;
while ((status = accept_input ()) != 1 &&
ralen () > 0 && --retry_count > 0)
cygwait ((DWORD) 10);
if (status != 1)
{
ret = status ? line_edit_error : line_edit_pipe_full;
nread += ralen ();
}
ret = status ? line_edit_error : line_edit_pipe_full;
else
ret = line_edit_input_done;
}
/* Adding one compensates for the postdecrement in the above loop. */
if (bytes_read)
*bytes_read -= (nread + 1);
*bytes_read = read_cnt;
if (sawsig)
ret = line_edit_signalled;

11
winsup/cygwin/fhandler_tty.cc
View File

@ -561,18 +561,21 @@ fhandler_pty_master::accept_input ()
{
n = p1 - p0 + 1;
rc = WriteFile (write_to, p0, n, &n, NULL);
written += n;
if (rc)
written += n;
p0 = p1 + 1;
}
if ((n = bytes_left - (p0 - p)))
if (rc && (n = bytes_left - (p0 - p)))
{
rc = WriteFile (write_to, p0, n, &n, NULL);
written += n;
if (rc)
written += n;
}
if (!rc)
if (!rc && written == 0)
{
debug_printf ("error writing to pipe %p %E", write_to);
get_ttyp ()->read_retval = -1;
puts_readahead (p, bytes_left);
ret = -1;
}
else