drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: pty: Treat both CR and NL as line feed in transfer_inpup(). 

- To make read() work properly in canonical mode, writing to the pty
  pipe should be done line by line. However, only CR was treated as
  line separator previously in transfer_input(). This patch fixes
  the issue.
This commit is contained in:
Takashi Yano 2022-03-04 16:05:35 +09:00
parent 845515267b
commit a263b94b5e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/fhandler_tty.cc
View File

@ -3942,9 +3942,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
} }
/* Call WriteFile() line by line */ /* Call WriteFile() line by line */
char *p0 = ptr; char *p0 = ptr;
char *p1 = ptr; char *p_cr, *p_nl;
while ((p1 = (char *) memchr (p0, '\r', len - (p0 - ptr)))) while ((p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr)))
|| (p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr))))
{ {
char *p1 = p_cr ? (p_nl ? min (p_cr, p_nl) : p_cr) : p_nl;
*p1 = '\n'; *p1 = '\n';
n = p1 - p0 + 1; n = p1 - p0 + 1;
if (n && WriteFile (to, p0, n, &n, NULL) && n) if (n && WriteFile (to, p0, n, &n, NULL) && n)