From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 291D23858402; Sun, 13 Feb 2022 15:17:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 291D23858402 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty, console: Fix Ctrl-C handling for non-cygwin apps. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/cygwin-3_3-branch X-Git-Oldrev: a6f441c8d22a38dd8b8bee1190fa391abde57522 X-Git-Newrev: 92d1ae1d0c9fd0da5ca7016f1d2afbc67613f0f1 Message-Id: <20220213151745.291D23858402@sourceware.org> Date: Sun, 13 Feb 2022 15:17:45 +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: Sun, 13 Feb 2022 15:17:45 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D92d1ae1d0c9= fd0da5ca7016f1d2afbc67613f0f1 commit 92d1ae1d0c9fd0da5ca7016f1d2afbc67613f0f1 Author: Takashi Yano Date: Thu Feb 10 16:53:47 2022 +0900 Cygwin: pty, console: Fix Ctrl-C handling for non-cygwin apps. =20 - Currently, if cat is started from cmd.exe which is started in cygwin console, Ctrl-C terminates not only cat but also cmd.exe. This also happens in pty in which pseudo console is disabled. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler_console.cc | 28 ++++++++++++++++++++++++++++ winsup/cygwin/fhandler_termios.cc | 38 +++++++++++++++++++++++++++++++++++= +++ 2 files changed, 66 insertions(+) diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_con= sole.cc index 17452cd27..9b94f3c42 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -238,6 +238,33 @@ fhandler_console::cons_master_thread (handle_set_t *p,= tty *ttyp) char c =3D (char) wc; bool processed =3D false; termios &ti =3D ttyp->ti; + pinfo pi (ttyp->getpgid ()); + if (pi && pi->ctty =3D=3D ttyp->ntty + && (pi->process_state & PID_NOTCYGWIN) + && input_rec[i].EventType =3D=3D KEY_EVENT && c =3D=3D '\003') + { + bool not_a_sig =3D false; + if (!CCEQ (ti.c_cc[VINTR], c) + && !CCEQ (ti.c_cc[VQUIT], c) + && !CCEQ (ti.c_cc[VSUSP], c)) + not_a_sig =3D true; + if (input_rec[i].Event.KeyEvent.bKeyDown) + { + /* CTRL_C_EVENT does not work for the process started with + CREATE_NEW_PROCESS_GROUP flag, so send CTRL_BREAK_EVENT + instead. */ + if (pi->process_state & PID_NEW_PG) + GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT, + pi->dwProcessId); + else + GenerateConsoleCtrlEvent (CTRL_C_EVENT, 0); + if (not_a_sig) + goto skip_writeback; + } + processed =3D true; + if (not_a_sig) + goto remove_record; + } switch (input_rec[i].EventType) { case KEY_EVENT: @@ -310,6 +337,7 @@ fhandler_console::cons_master_thread (handle_set_t *p, = tty *ttyp) processed =3D true; break; } +remove_record: if (processed) { /* Remove corresponding record. */ memmove (input_rec + i, input_rec + i + 1, diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_ter= mios.cc index 3461d1785..fe1021520 100644 --- a/winsup/cygwin/fhandler_termios.cc +++ b/winsup/cygwin/fhandler_termios.cc @@ -147,6 +147,8 @@ tty_min::kill_pgrp (int sig) _pinfo *p =3D pids[i]; if (!p || !p->exists () || p->ctty !=3D ntty || p->pgid !=3D pgid) continue; + if (p->process_state & PID_NOTCYGWIN) + continue; if (p =3D=3D myself) killself =3D sig !=3D __SIGSETPGRP && !exit_state; else @@ -326,6 +328,42 @@ fhandler_termios::line_edit (const char *rptr, size_t = nread, termios& ti, =20 if (ti.c_iflag & ISTRIP) c &=3D 0x7f; + winpids pids ((DWORD) 0); + if (get_ttyp ()->pcon_input_state_eq (tty::to_nat)) + { + bool need_discard_input =3D false; + for (unsigned i =3D 0; i < pids.npids; i++) + { + _pinfo *p =3D pids[i]; + if (c =3D=3D '\003' && p && p->ctty =3D=3D tc ()->ntty + && p->pgid =3D=3D tc ()->getpgid () + && (p->process_state & PID_NOTCYGWIN)) + { + /* CTRL_C_EVENT does not work for the process started with + CREATE_NEW_PROCESS_GROUP flag, so send CTRL_BREAK_EVENT + instead. */ + if (p->process_state & PID_NEW_PG) + GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT, + p->dwProcessId); + else + GenerateConsoleCtrlEvent (CTRL_C_EVENT, 0); + need_discard_input =3D true; + } + } + if (need_discard_input + && !CCEQ (ti.c_cc[VINTR], c) + && !CCEQ (ti.c_cc[VQUIT], c) + && !CCEQ (ti.c_cc[VSUSP], c)) + { + if (!(ti.c_lflag & NOFLSH)) + { + eat_readahead (-1); + discard_input (); + } + ti.c_lflag &=3D ~FLUSHO; + continue; + } + } if (ti.c_lflag & ISIG) { int sig;