github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 22:17:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unify the SIGQUIT handlers and remove set_non_interactive_handlers

Browse Source 
Interactive signal handlers are now a strict superset of non-interactive
ones. Remove set_non_interactive_handlers()
This commit is contained in:
ridiculousfish 2019-05-26 13:18:06 -07:00
parent d729d57d94
commit ead7f28026
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/signal.cpp
View File

@ -292,7 +292,6 @@ static void set_interactive_handlers() {
// Interactive mode. Ignore interactive signals. We are a shell, we know what is best for
// the user.
act.sa_handler = SIG_IGN;
sigaction(SIGQUIT, &act, NULL);
sigaction(SIGTSTP, &act, NULL);
sigaction(SIGTTOU, &act, NULL);
@ -325,15 +324,6 @@ static void set_interactive_handlers() {
#endif
}
static void set_non_interactive_handlers() {
struct sigaction act;
act.sa_flags = 0;
sigemptyset(&act.sa_mask);
act.sa_handler = SIG_IGN;
sigaction(SIGQUIT, &act, 0);
}
/// Sets up appropriate signal handlers.
void signal_set_handlers() {
struct sigaction act;
@ -346,6 +336,10 @@ void signal_set_handlers() {
act.sa_handler = SIG_IGN;
sigaction(SIGPIPE, &act, 0);
// Ignore SIGQUIT.
act.sa_handler = SIG_IGN;
sigaction(SIGQUIT, &act, 0);
// Apply our SIGINT handler.
act.sa_sigaction = &handle_int;
act.sa_flags = SA_SIGINFO;
@ -362,8 +356,6 @@ void signal_set_handlers() {
if (shell_is_interactive()) {
set_interactive_handlers();
} else {
set_non_interactive_handlers();
}
}