From ea9e05568e0d0b555f3f9f5e8a2d2bcf6d78e1c0 Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Sat, 25 Feb 2017 21:06:30 -0800 Subject: [PATCH] Revert "make not blocking signals the default" This reverts commit e30f3fee88308f867eb83cd497f38c12ed1aab70. Not sure why I didn't notice this before merging it but the change I'm reverting makes it impossible to start a login shell. --- src/fish.cpp | 2 +- src/signal.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fish.cpp b/src/fish.cpp index 143d338f0..eeafa5591 100644 --- a/src/fish.cpp +++ b/src/fish.cpp @@ -408,7 +408,7 @@ int main(int argc, char **argv) { // TODO: Remove this once we're confident that not blocking/unblocking every signal around // some critical sections is no longer necessary. env_var_t fish_no_signal_block = env_get_string(L"FISH_NO_SIGNAL_BLOCK"); - if (!fish_no_signal_block.missing_or_empty() && !from_string(fish_no_signal_block)) ignore_signal_block = false; + if (!fish_no_signal_block.missing()) ignore_signal_block = true; // Stomp the exit status of any initialization commands (issue #635). proc_set_last_status(STATUS_BUILTIN_OK); diff --git a/src/signal.cpp b/src/signal.cpp index 8c4f994ae..8fe2bd2d8 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -17,7 +17,7 @@ #include "wutil.h" // IWYU pragma: keep // This is a temporary var while we explore whether signal_block() and friends is needed. -bool ignore_signal_block = true; +bool ignore_signal_block = false; /// Struct describing an entry for the lookup table used to convert between signal names and signal /// ids, etc.