[newlib-cygwin] Cygwin: pty: Treat both CR and NL as line feed in transfer_inpup().

Takashi Yano tyan0@sourceware.org
Fri Mar 4 11:09:18 GMT 2022


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a263b94b5efd4595bf72425a975a8e29fcc989de

commit a263b94b5efd4595bf72425a975a8e29fcc989de
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Fri Mar 4 16:05:35 2022 +0900

    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.

Diff:
---
 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)


More information about the Cygwin-cvs mailing list