From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH] Cygwin: pty: Treat both CR and NL as line feed in transfer_inpup().
Date: Fri, 4 Mar 2022 20:05:54 +0900 [thread overview]
Message-ID: <20220304110556.2139-1-takashi.yano@nifty.ne.jp> (raw)
- 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 2f13e9990..76c5e2413 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -3938,9 +3938,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.35.1
next reply other threads:[~2022-03-04 11:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 11:05 Takashi Yano [this message]
2022-03-04 11:05 ` [PATCH] Cygwin: pty: Rearrange reset_switch_to_nat_pipe() calls Takashi Yano
2022-03-04 11:05 ` [PATCH] Cygwin: pty: Omit transfer_input() call where it is no longer needed Takashi Yano
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220304110556.2139-1-takashi.yano@nifty.ne.jp \
--to=takashi.yano@nifty.ne.jp \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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).