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: Fix a bug regarding ESC[?3h and ESC[?3l handling. Date: Wed, 18 Dec 2019 19:25:00 -0000 [thread overview] Message-ID: <20191218192501.87846.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=fe512b2b12a2cea8393d14f038dc3914b1bf3f60 commit fe512b2b12a2cea8393d14f038dc3914b1bf3f60 Author: Takashi Yano <takashi.yano@nifty.ne.jp> Date: Thu Dec 19 01:07:33 2019 +0900 Cygwin: pty: Fix a bug regarding ESC[?3h and ESC[?3l handling. - Midnight commander (mc) does not work after the commit 1626569222066ee601f6c41b29efcc95202674b7 as reported in https://www.cygwin.com/ml/cygwin/2019-12/msg00173.html. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler_tty.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 1d344c7..8c3a6e7 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -1262,16 +1262,19 @@ fhandler_pty_slave::push_to_pcon_screenbuffer (const char *ptr, size_t len) while ((p0 = (char *) memmem (p0, nlen - (p0 - buf), "\033[?", 3))) { p0 += 3; - while (p0 < buf + nlen && *p0 != 'h' && *p0 != 'l') + bool exist_arg_3 = false; + while (p0 < buf + nlen && !isalpha (*p0)) { int arg = 0; while (p0 < buf + nlen && isdigit (*p0)) arg = arg * 10 + (*p0 ++) - '0'; if (arg == 3) - get_ttyp ()->need_redraw_screen = true; + exist_arg_3 = true; if (p0 < buf + nlen && *p0 == ';') p0 ++; } + if (p0 < buf + nlen && exist_arg_3 && (*p0 == 'h' || *p0 == 'l')) + get_ttyp ()->need_redraw_screen = true; p0 ++; if (p0 >= buf + nlen) break;
reply other threads:[~2019-12-18 19:25 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=20191218192501.87846.qmail@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).