From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 12E3438460A3; Mon, 18 Jan 2021 10:23:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 12E3438460A3 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: Add workaround for rlwrap 0.40 or later. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano via Cygwin-patches X-Git-Refname: refs/heads/master X-Git-Oldrev: 9ad86f619c44f612d6eb14c8b3fe76096cbbe645 X-Git-Newrev: fa22eea29d2f3214e9e241c34efce658574d3290 Message-Id: <20210118102351.12E3438460A3@sourceware.org> Date: Mon, 18 Jan 2021 10:23:51 +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, 18 Jan 2021 10:23:51 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=fa22eea29d2f3214e9e241c34efce658574d3290 commit fa22eea29d2f3214e9e241c34efce658574d3290 Author: Takashi Yano via Cygwin-patches Date: Fri Jan 15 17:32:09 2021 +0900 Cygwin: pty: Add workaround for rlwrap 0.40 or later. - The workaround for rlwrap introduced by commit 8199b0cc does not take effect for rlwrap 0.40 or later. This patch add a workaround for rlwrap 0.40 or later as well. Diff: --- winsup/cygwin/fhandler_tty.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 77f7bfe43..8ff74cdde 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -1720,6 +1720,11 @@ int fhandler_pty_master::tcgetattr (struct termios *t) { *t = cygwin_shared->tty[get_minor ()]->ti; + /* Workaround for rlwrap v0.40 or later */ + if (get_ttyp ()->pcon_start) + t->c_lflag &= ~(ICANON | ECHO); + if (get_ttyp ()->h_pseudo_console) + t->c_iflag &= ~ICRNL; return 0; }