diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2019-12-19 01:07:33 +0900 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2019-12-18 20:20:13 +0100 |
| commit | fe512b2b12a2cea8393d14f038dc3914b1bf3f60 (patch) | |
| tree | 6cbec3d6d528bfde47a7016268a7de3fc0f808cc | |
| parent | 91f1eab9a987011d84681f0842c4cad7478cd334 (diff) | |
| download | cygnal-fe512b2b12a2cea8393d14f038dc3914b1bf3f60.tar.gz cygnal-fe512b2b12a2cea8393d14f038dc3914b1bf3f60.tar.bz2 cygnal-fe512b2b12a2cea8393d14f038dc3914b1bf3f60.zip | |
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.
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 1d344c7fe..8c3a6e72e 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; |