From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 6FA91385840C; Mon, 13 Dec 2021 11:14:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6FA91385840C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Fix Ctrl-C handling further 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: 22953c530ce5d4b00d161f36774b1ad246a892db X-Git-Newrev: f9bfc5f52c79d61dde8f84d0cbd7ad633abed4cb Message-Id: <20211213111415.6FA91385840C@sourceware.org> Date: Mon, 13 Dec 2021 11:14:15 +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: Mon, 13 Dec 2021 11:14:15 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=f9bfc5f52c79d61dde8f84d0cbd7ad633abed4cb commit f9bfc5f52c79d61dde8f84d0cbd7ad633abed4cb Author: Takashi Yano Date: Mon Dec 13 19:25:22 2021 +0900 Cygwin: pty: Fix Ctrl-C handling further for non-cygwin apps. - The recent commit: "Cygwin: pty: Fix Ctrl-C handling for non-cygwin apps in background." causes the problem that cmd.exe is terminated by Ctrl-C even if it is running in pseudo console. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler_tty.cc | 36 +++++++++++++++++++++++++++++++++++- winsup/cygwin/include/sys/cygwin.h | 2 ++ winsup/cygwin/spawn.cc | 3 +++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 7b18a15e7..5ec5b235d 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -2251,7 +2251,41 @@ fhandler_pty_master::write (const void *ptr, size_t len) if ((ti.c_lflag & ISIG) && memchr (buf, '\003', nlen)) { - get_ttyp ()->kill_pgrp (SIGINT); + /* If the process is started with CREATE_NEW_PROCESS_GROUP + flag, Ctrl-C will not be sent to that process. Therefore, + send Ctrl-break event to that process here. */ + DWORD wpid = 0; + winpids pids ((DWORD) 0); + for (unsigned i = 0; i < pids.npids; i++) + { + _pinfo *p = pids[i]; + if (p->ctty == get_ttyp ()->ntty + && p->pgid == get_ttyp ()->getpgid () + && (p->process_state & PID_NEW_PG)) + { + wpid = p->dwProcessId; + break; + } + } + pinfo pinfo_resume = pinfo (myself->ppid); + DWORD resume_pid; + if (pinfo_resume) + resume_pid = pinfo_resume->dwProcessId; + else + resume_pid = get_console_process_id (myself->dwProcessId, false); + if (wpid && resume_pid) + { + WaitForSingleObject (pcon_mutex, INFINITE); + FreeConsole (); + AttachConsole (wpid); + /* CTRL_C_EVENT does not work for the process started with + CREATE_NEW_PROCESS_GROUP flag, so send CTRL_BREAK_EVENT + instead. */ + GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT, wpid); + FreeConsole (); + AttachConsole (resume_pid); + ReleaseMutex (pcon_mutex); + } if (!(ti.c_lflag & NOFLSH)) get_ttyp ()->discard_input = true; } diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h index 805671ef9..ac55ab09c 100644 --- a/winsup/cygwin/include/sys/cygwin.h +++ b/winsup/cygwin/include/sys/cygwin.h @@ -274,6 +274,8 @@ enum PID_NEW = 0x01000, /* Available. */ PID_ALLPIDS = 0x02000, /* used by pinfo scanner */ PID_PROCINFO = 0x08000, /* caller just asks for process info */ + PID_NEW_PG = 0x10000, /* Process created with + CREATE_NEW_PROCESS_GROUOP flag */ PID_EXITED = 0x40000000, /* Free entry. */ PID_REAPED = 0x80000000 /* Reaped */ }; diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index bea4d0194..b93063d9b 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -575,6 +575,9 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, c_flags |= CREATE_NEW_PROCESS_GROUP; refresh_cygheap (); + if (c_flags & CREATE_NEW_PROCESS_GROUP) + myself->process_state |= PID_NEW_PG; + if (mode == _P_DETACH) /* all set */; else if (mode != _P_OVERLAY || !my_wr_proc_pipe)