public inbox for
help / color / mirror / Atom feed
From: Takashi Yano <>
Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Treat both CR and NL as line feed in transfer_inpup().
Date: Fri,  4 Mar 2022 11:08:51 +0000 (GMT)	[thread overview]
Message-ID: <> (raw);h=380e61dabe6cd5502046db425ff40815086b154a

commit 380e61dabe6cd5502046db425ff40815086b154a
Author: Takashi Yano <>
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.

 winsup/cygwin/ | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/ b/winsup/cygwin/
index 1fd8a6094..2d7e2cf69 100644
--- a/winsup/cygwin/
+++ b/winsup/cygwin/
@@ -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)

                 reply	other threads:[~2022-03-04 11:08 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).