On Jan 19 18:27, Takashi Yano via Cygwin-patches wrote:
> - This patch lessens the side effect of the workaround for rlwrap
> introduced by commit 4e16b033.
> ---
> 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;
> }
>
> --
> 2.30.0
Pushed.
Thanks,
Corinna
