Fix hup_background_jobs (née kill_background_jobs) implementation

This was introduced in 1b1bc28c0a but did
not cause any problems until the job control refactor, which caused it
to attempt to signal the calling `exec` builtin's own (invalid) pgrp
with SIGHUP.

Also improved debugging for `j->signal()` failures by printing the
signal we tried sending in case of error, rename the function to
`hup_background_jobs`, and move it from `reader.h`/`reader.cpp` to
`proc.h`/`proc.cpp`.
This commit is contained in:
Mahmoud Al-Qudsi
2018-10-20 13:58:51 -05:00
parent 4d3b56c151
commit 0d8334a31b
5 changed files with 27 additions and 17 deletions

View File

@@ -1780,7 +1780,7 @@ static void reader_interactive_init() {
// Try stopping us.
int ret = killpg(shell_pgid, SIGTTIN);
if (ret < 0) {
wperror(L"killpg");
wperror(L"killpg(shell_pgid, SIGTTIN)");
exit_without_destructors(1);
}
}
@@ -2251,16 +2251,6 @@ void reader_bg_job_warning() {
fputws(_(L"Use 'disown PID' to remove jobs from the list without terminating them.\n"), stdout);
}
void kill_background_jobs() {
job_iterator_t jobs;
while (job_t *j = jobs.next()) {
if (!j->is_completed()) {
if (j->is_stopped()) j->signal(SIGCONT);
j->signal(SIGHUP);
}
}
}
/// This function is called when the main loop notices that end_loop has been set while in
/// interactive mode. It checks if it is ok to exit.
static void handle_end_loop() {
@@ -2293,7 +2283,7 @@ static void handle_end_loop() {
}
// Kill remaining jobs before exiting.
kill_background_jobs();
hup_background_jobs();
}
static bool selection_is_at_top() {