public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Treat both CR and NL as line feed in transfer_inpup().
@ 2022-03-04 11:08 Takashi Yano
  0 siblings, 0 replies; only message in thread
From: Takashi Yano @ 2022-03-04 11:08 UTC (permalink / raw)
  To: cygwin-cvs

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

commit 380e61dabe6cd5502046db425ff40815086b154a
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 1fd8a6094..2d7e2cf69 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -3972,9 +3972,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)


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-03-04 11:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-04 11:08 [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Treat both CR and NL as line feed in transfer_inpup() Takashi Yano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).