public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Takashi Yano <tyan0@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Treat both CR and NL as line feed in transfer_inpup(). Date: Fri, 4 Mar 2022 11:09:18 +0000 (GMT) [thread overview] Message-ID: <20220304110918.7E08C385800C@sourceware.org> (raw) 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)
reply other threads:[~2022-03-04 11:09 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=20220304110918.7E08C385800C@sourceware.org \ --to=tyan0@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /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: linkBe 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).