RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 20:18:12 +00:00
Code Issues Activity Actions

Shell: Make interrupts kill the whole chain and not just the current job

Browse source 
This makes interrupting `sleep 10; echo hi` not print `hi` anymore,
which is the expected behaviour anyway.
Also fixes the problem with fast-running loops "eating" interrupts and
not quitting.
This commit is contained in:
Ali Mohammad Pur 2022-01-09 09:19:01 +03:30 • committed by Ali Mohammad Pur
parent abaee3a325
commit ea66750640
3 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Shell/Shell.cpp
View file

@ -1765,7 +1765,12 @@ void Shell::notify_child_event()
}
if (child_pid == job.pid()) {
if (WIFSIGNALED(wstatus) && !WIFSTOPPED(wstatus)) {
job.set_signalled(WTERMSIG(wstatus));
auto signal = WTERMSIG(wstatus);
job.set_signalled(signal);
if (signal == SIGINT)
raise_error(ShellError::InternalControlFlowInterrupted, "Interrupted"sv, job.command().position);
else if (signal == SIGKILL)
raise_error(ShellError::InternalControlFlowKilled, "Interrupted"sv, job.command().position);
} else if (WIFEXITED(wstatus)) {
job.set_has_exit(WEXITSTATUS(wstatus));
} else if (WIFSTOPPED(wstatus)) {
@ -1998,6 +2003,8 @@ void Shell::possibly_print_error() const
break;
case ShellError::InternalControlFlowBreak:
case ShellError::InternalControlFlowContinue:
case ShellError::InternalControlFlowInterrupted:
case ShellError::InternalControlFlowKilled:
return;
case ShellError::None:
return;