public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Lessen the side effect of workaround for rlwarp. Date: Tue, 19 Jan 2021 09:57:20 +0000 (GMT) [thread overview] Message-ID: <20210119095720.E7580384BC14@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=62e739b51bb1cbe644470c40ca414d8a2ea34c18 commit 62e739b51bb1cbe644470c40ca414d8a2ea34c18 Author: Takashi Yano via Cygwin-patches <cygwin-patches@cygwin.com> Date: Tue Jan 19 18:27:02 2021 +0900 Cygwin: pty: Lessen the side effect of workaround for rlwarp. - This patch lessens the side effect of the workaround for rlwrap introduced by commit 4e16b033. Diff: --- winsup/cygwin/fhandler_tty.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 473c0c968..c78e996e8 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -1176,11 +1176,19 @@ fhandler_pty_slave::tcgetattr (struct termios *t) { reset_switch_to_pcon (); *t = get_ttyp ()->ti; + /* Workaround for rlwrap */ - if (get_ttyp ()->pcon_start) - t->c_lflag &= ~(ICANON | ECHO); - if (get_ttyp ()->h_pseudo_console) - t->c_iflag &= ~ICRNL; + cygheap_fdenum cfd (false); + while (cfd.next () >= 0) + if (cfd->get_major () == DEV_PTYM_MAJOR + && cfd->get_minor () == get_minor ()) + { + if (get_ttyp ()->pcon_start) + t->c_lflag &= ~(ICANON | ECHO); + if (get_ttyp ()->h_pseudo_console) + t->c_iflag &= ~ICRNL; + break; + } return 0; }
reply other threads:[~2021-01-19 9:57 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=20210119095720.E7580384BC14@sourceware.org \ --to=corinna@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).