From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 29 Jan 2012 15:43:51 +0000 (+0100)
Subject: On Ctrl-C induced detach, send SIGINT to child tracee, not SIGTERM.
X-Git-Tag: v4.7~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3559250d48ccc3ef755183ebb3246cbbb442c0d;p=strace

On Ctrl-C induced detach, send SIGINT to child tracee, not SIGTERM.

* strace.c (interrupt): Remember signal number.
(cleanup): If we exiting due to signal, send that signal to child tracee.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/strace.c b/strace.c
index 26d7010f..09111405 100644
--- a/strace.c
+++ b/strace.c
@@ -149,9 +149,9 @@ static sigset_t empty_set, blocked_set;
 
 #ifdef HAVE_SIG_ATOMIC_T
 static volatile sig_atomic_t interrupted;
-#else /* !HAVE_SIG_ATOMIC_T */
+#else
 static volatile int interrupted;
-#endif /* !HAVE_SIG_ATOMIC_T */
+#endif
 
 #ifdef USE_PROCFS
 
@@ -1939,6 +1939,7 @@ cleanup(void)
 {
 	int i;
 	struct tcb *tcp;
+	int fatal_sig = interrupted ? interrupted : SIGTERM;
 
 	for (i = 0; i < tcbtabsize; i++) {
 		tcp = tcbtab[i];
@@ -1956,7 +1957,7 @@ cleanup(void)
 			detach(tcp);
 		else {
 			kill(tcp->pid, SIGCONT);
-			kill(tcp->pid, SIGTERM);
+			kill(tcp->pid, fatal_sig);
 		}
 	}
 	if (cflag)
@@ -1966,7 +1967,7 @@ cleanup(void)
 static void
 interrupt(int sig)
 {
-	interrupted = 1;
+	interrupted = sig;
 }
 
 #ifndef HAVE_STRERROR