diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-07-31 20:50:19 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-07-31 20:50:19 +0000 |
| commit | f1d440e139d675b199d4e4c1ef4032e8b6da1a39 (patch) | |
| tree | d93b19fc3c71ddb2469670ea13637281a9d9fbaf | |
| parent | changelog: asynchronous client application termination (diff) | |
term: send SIGTERM/SIGKILL to the entire process group
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | terminal.c | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b8b67e7..086b1483 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,8 @@ terminating the client application) from 4 to 60 seconds. * When terminating the client application, foot now sends `SIGTERM` immediately after closing the PTY, instead of waiting 2 seconds. +* Foot now sends `SIGTERM`/`SIGKILL` to the client application’s process group, + instead of just to the client application’s process. ### Deprecated @@ -1426,7 +1426,7 @@ fdm_terminate_timeout(struct fdm *fdm, int fd, int events, void *data) LOG_DBG("slave (PID=%u) has not terminated, sending SIGKILL (%d)", term->slave, SIGKILL); - kill(term->slave, SIGKILL); + kill(-term->slave, SIGKILL); return true; } @@ -1460,10 +1460,10 @@ term_shutdown(struct terminal *term) close(term->ptmx); if (!term->shutdown.client_has_terminated) { - LOG_DBG("initiating asynchronous terminate of slave (PID=%u)", - term->slave); + LOG_DBG("initiating asynchronous terminate of slave; " + "sending SIGTERM to PID=%u", term->slave); - kill(term->slave, SIGTERM); + kill(-term->slave, SIGTERM); const struct itimerspec timeout = {.it_value = {.tv_sec = 60}}; @@ -1642,10 +1642,10 @@ term_destroy(struct terminal *term) if (term->shutdown.client_has_terminated) exit_status = term->shutdown.exit_status; else { - LOG_DBG("initiating blocking terminate of slave (PID=%u)", - term->slave); + LOG_DBG("initiating blocking terminate of slave; " + "sending SIGTERM to PID=%u", term->slave); - kill(term->slave, SIGTERM); + kill(-term->slave, SIGTERM); /* * we’ve closed the ptxm, and sent SIGTERM to the client @@ -1680,7 +1680,7 @@ term_destroy(struct terminal *term) "slave (PID=%u) has not terminate yet, " "sending: SIGKILL (%d)", term->slave, SIGKILL); - kill(term->slave, SIGKILL); + kill(-term->slave, SIGKILL); } } } |
