From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH] Cygwin: pty: Take account of CR+NL line feed in input.
Date: Sat, 5 Mar 2022 00:48:34 +0900 [thread overview]
Message-ID: <20220304154834.1880-1-takashi.yano@nifty.ne.jp> (raw)
- Currently, individual CR or NL is treated as line feed in
accept_input() and transfer_input(). This patch takes account
of CR+NL as well.
---
winsup/cygwin/fhandler_tty.cc | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 3ed84709e..0c762d75e 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -571,16 +571,21 @@ fhandler_pty_master::accept_input ()
paranoid_printf ("about to write %u chars to slave", bytes_left);
/* Write line by line for transfer input. */
char *p0 = p;
- char *p1 = p;
+ char *p_cr = (char *) memchr (p0, '\r', bytes_left - (p0 - p));
+ char *p_nl = (char *) memchr (p0, '\n', bytes_left - (p0 - p));
DWORD n;
- while ((p1 = (char *) memchr (p0, '\n', bytes_left - (p0 - p)))
- || (p1 = (char *) memchr (p0, '\r', bytes_left - (p0 - p))))
+ while (p_cr || p_nl)
{
+ char *p1 =
+ p_cr ? (p_nl ? ((p_cr + 1 == p_nl)
+ ? p_nl : min(p_cr, p_nl)) : p_cr) : p_nl;
n = p1 - p0 + 1;
rc = WriteFile (write_to, p0, n, &n, NULL);
if (rc)
written += n;
p0 = p1 + 1;
+ p_cr = (char *) memchr (p0, '\r', bytes_left - (p0 - p));
+ p_nl = (char *) memchr (p0, '\n', bytes_left - (p0 - p));
}
if (rc && (n = bytes_left - (p0 - p)))
{
@@ -3905,16 +3910,20 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
}
/* Call WriteFile() line by line */
char *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 *p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr));
+ char *p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr));
+ while (p_cr || p_nl)
{
- char *p1 = p_cr ? (p_nl ? min (p_cr, p_nl) : p_cr) : p_nl;
+ char *p1 =
+ p_cr ? (p_nl ? ((p_cr + 1 == p_nl)
+ ? 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)
transfered = true;
p0 = p1 + 1;
+ p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr));
+ p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr));
}
n = len - (p0 - ptr);
if (n && WriteFile (to, p0, n, &n, NULL) && n)
--
2.35.1
reply other threads:[~2022-03-04 15:49 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:
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=20220304154834.1880-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).