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

Cygwin: pty: Take account of CR+NL line feed in input. 

- Currently, individual CR or NL is treated as line feed in
  accept_input() and transfer_input(). This patch takes account
  of CR+NL as well.
This commit is contained in:
Takashi Yano 2022-03-04 23:57:12 +09:00
parent 51095fe2ba
commit 21860254da
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
winsup/cygwin/fhandler_tty.cc
View File

@ -571,16 +571,21 @@ fhandler_pty_master::accept_input ()
paranoid_printf ("about to write %u chars to slave", bytes_left); paranoid_printf ("about to write %u chars to slave", bytes_left);
/* Write line by line for transfer input. */ /* Write line by line for transfer input. */
char *p0 = p; char *p0 = p;
char *p1 = p; char *p_cr = (char *) memchr (p0, '\r', bytes_left - (p0 - p));
char *p_nl = (char *) memchr (p0, '\n', bytes_left - (p0 - p));
DWORD n; DWORD n;
while ((p1 = (char *) memchr (p0, '\n', bytes_left - (p0 - p))) while (p_cr || p_nl)
|| (p1 = (char *) memchr (p0, '\r', bytes_left - (p0 - p))))
{ {
char *p1 =
p_cr ? (p_nl ? ((p_cr + 1 == p_nl)
? p_nl : min(p_cr, p_nl)) : p_cr) : p_nl;
n = p1 - p0 + 1; n = p1 - p0 + 1;
rc = WriteFile (write_to, p0, n, &n, NULL); rc = WriteFile (write_to, p0, n, &n, NULL);
if (rc) if (rc)
written += n; written += n;
p0 = p1 + 1; p0 = p1 + 1;
p_cr = (char *) memchr (p0, '\r', bytes_left - (p0 - p));
p_nl = (char *) memchr (p0, '\n', bytes_left - (p0 - p));
} }
if (rc && (n = bytes_left - (p0 - p))) if (rc && (n = bytes_left - (p0 - p)))
{ {
@ -3905,16 +3910,20 @@ 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 *p_cr, *p_nl; char *p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr));
while ((p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr))) char *p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr));
|| (p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr)))) while (p_cr || p_nl)
{ {
char *p1 = p_cr ? (p_nl ? min (p_cr, p_nl) : p_cr) : p_nl; char *p1 =
p_cr ? (p_nl ? ((p_cr + 1 == p_nl)
? 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)
transfered = true; transfered = true;
p0 = p1 + 1; p0 = p1 + 1;
p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr));
p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr));
} }
n = len - (p0 - ptr); n = len - (p0 - ptr);
if (n && WriteFile (to, p0, n, &n, NULL) && n) if (n && WriteFile (to, p0, n, &n, NULL) && n)