From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 10A88394BE3A; Mon, 15 Feb 2021 12:06:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 10A88394BE3A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Fix a bug in input transfer for GDB. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano via Cygwin-patches X-Git-Refname: refs/heads/master X-Git-Oldrev: f206417894273ef73c7bca0f00213866945d8b4d X-Git-Newrev: 2b94fad48edf07490113ab5052f2a39cfccb43c9 Message-Id: <20210215120604.10A88394BE3A@sourceware.org> Date: Mon, 15 Feb 2021 12:06:04 +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: Mon, 15 Feb 2021 12:06:04 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2b94fad48edf07490113ab5052f2a39cfccb43c9 commit 2b94fad48edf07490113ab5052f2a39cfccb43c9 Author: Takashi Yano via Cygwin-patches Date: Mon Feb 15 03:47:51 2021 +0900 Cygwin: pty: Fix a bug in input transfer for GDB. - With this patch, not only NL but also CR is treated as a line end in the code checking if input transfer is necessary. Diff: --- winsup/cygwin/fhandler_tty.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index f6eb3ae4d..5afede859 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -1181,7 +1181,7 @@ fhandler_pty_slave::mask_switch_to_pcon_in (bool mask, bool xfer) /* In GDB, transfer input based on setpgid() does not work because GDB may not set terminal process group properly. Therefore, transfer input here if isHybrid is set. */ - if (get_ttyp ()->switch_to_pcon_in && !!masked != mask && xfer && isHybrid) + if (isHybrid && !!masked != mask && xfer) { if (mask && get_ttyp ()->pcon_input_state_eq (tty::to_nat)) { @@ -1471,7 +1471,8 @@ wait_retry: out: termios_printf ("%d = read(%p, %lu)", totalread, ptr, len); len = (size_t) totalread; - mask_switch_to_pcon_in (false, totalread > 0 && ptr0[totalread - 1] == '\n'); + bool saw_eol = totalread > 0 && strchr ("\r\n", ptr0[totalread -1]); + mask_switch_to_pcon_in (false, saw_eol); } int