From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 7E08C385800C; Fri, 4 Mar 2022 11:09:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E08C385800C Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Treat both CR and NL as line feed in transfer_inpup(). X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: 845515267b8dfb7198ae5ca9d4a30d58b2a3d995 X-Git-Newrev: a263b94b5efd4595bf72425a975a8e29fcc989de Message-Id: <20220304110918.7E08C385800C@sourceware.org> Date: Fri, 4 Mar 2022 11:09:18 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Mar 2022 11:09:18 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Da263b94b5ef= d4595bf72425a975a8e29fcc989de commit a263b94b5efd4595bf72425a975a8e29fcc989de 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(). =20 - 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 di= r, HANDLE from, tty *ttyp, } /* Call WriteFile() line by line */ char *p0 =3D ptr; - char *p1 =3D ptr; - while ((p1 =3D (char *) memchr (p0, '\r', len - (p0 - ptr)))) + char *p_cr, *p_nl; + while ((p_cr =3D (char *) memchr (p0, '\r', len - (p0 - ptr))) + || (p_nl =3D (char *) memchr (p0, '\n', len - (p0 - ptr)))) { + char *p1 =3D p_cr ? (p_nl ? min (p_cr, p_nl) : p_cr) : p_nl; *p1 =3D '\n'; n =3D p1 - p0 + 1; if (n && WriteFile (to, p0, n, &n, NULL) && n)