[newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Take account of CR+NL line feed in input.
Takashi Yano
tyan0@sourceware.org
Fri Mar 4 15:50:02 GMT 2022
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=21649fe6a126d9ee3a4a4d049e5742f3ab69c273
commit 21649fe6a126d9ee3a4a4d049e5742f3ab69c273
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Fri Mar 4 23:57:12 2022 +0900
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.
Diff:
---
winsup/cygwin/fhandler_tty.cc | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index a97460660..f78dc7617 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -582,16 +582,21 @@ fhandler_pty_master::accept_input ()
paranoid_printf ("about to write %u chars to slave", bytes_left);
/* Write line by line for transfer input. */
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;
- while ((p1 = (char *) memchr (p0, '\n', bytes_left - (p0 - p)))
- || (p1 = (char *) memchr (p0, '\r', bytes_left - (p0 - p))))
+ while (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;
n = p1 - p0 + 1;
rc = WriteFile (write_to, p0, n, &n, NULL);
if (rc)
written += n;
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)))
{
@@ -3973,16 +3978,20 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
}
/* Call WriteFile() line by line */
char *p0 = ptr;
- char *p_cr, *p_nl;
- while ((p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr)))
- || (p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr))))
+ char *p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr));
+ char *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';
n = p1 - p0 + 1;
if (n && WriteFile (to, p0, n, &n, NULL) && n)
transfered = true;
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);
if (n && WriteFile (to, p0, n, &n, NULL) && n)
More information about the Cygwin-cvs
mailing list