github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-15 23:22:53 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Allow fish to properly exit from job_continue when receiving a signal

Browse Source 
e340baf6cc introduced a bug where fish would not exit from job_continue
when receiving a signal like SIGHUP. This means that it would not in turn
deliver SIGHUP to its children, who would therefore never exit. Those
children may attempt to write to stdout, in which case they would receive
EIO; this can cause other weird issues, like telnet using 100% CPU.

Fixes #1958
This commit is contained in:
ridiculousfish 2015-02-27 09:53:57 -08:00
parent dd595dd110
commit b4aa2b7c2c
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
proc.cpp
View File

@ -1225,15 +1225,13 @@ void job_continue(job_t *j, bool cont)
if (job_get_flag(j, JOB_FOREGROUND))
{
bool quit = false;
/* Look for finished processes first, to avoid select() if it's already done. */
process_mark_finished_children(false);
/*
Wait for job to report.
*/
while (! job_is_stopped(j) && ! job_is_completed(j))
while (! reader_exit_forced() && ! job_is_stopped(j) && ! job_is_completed(j))
{
// debug( 1, L"select_try()" );
switch (select_try(j))
@ -1261,23 +1259,11 @@ void job_continue(job_t *j, bool cont)
speed boost (A factor 3 startup time
improvement on my 300 MHz machine) on
short-lived jobs.
This will return early if we get a signal,
like SIGHUP.
*/
int processed = process_mark_finished_children(true);
if (processed < 0)
{
/*
This probably means we got a
signal. A signal might mean that the
terminal emulator sent us a hup
signal to tell is to close. If so,
we should exit.
*/
if (reader_exit_forced())
{
quit = 1;
}
}
process_mark_finished_children(true);
break;
}
}