From a263b94b5efd4595bf72425a975a8e29fcc989de Mon Sep 17 00:00:00 2001 From: Takashi Yano Date: Fri, 4 Mar 2022 16:05:35 +0900 Subject: [PATCH] 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. --- winsup/cygwin/fhandler_tty.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 3332fefd6..b96a7b3cf 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -3942,9 +3942,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp, } /* Call WriteFile() line by line */ char *p0 = ptr; - char *p1 = ptr; - while ((p1 = (char *) memchr (p0, '\r', len - (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 *p1 = p_cr ? (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) -- 2.43.5