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-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "make not blocking signals the default"

Browse Source 
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.
This commit is contained in:
Kurtis Rader 2017-02-25 21:06:30 -08:00
parent e30f3fee88
commit ea9e05568e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fish.cpp
View File

@ -408,7 +408,7 @@ int main(int argc, char **argv) {
// TODO: Remove this once we're confident that not blocking/unblocking every signal around // TODO: Remove this once we're confident that not blocking/unblocking every signal around
// some critical sections is no longer necessary. // some critical sections is no longer necessary.
env_var_t fish_no_signal_block = env_get_string(L"FISH_NO_SIGNAL_BLOCK"); 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<bool>(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). // Stomp the exit status of any initialization commands (issue #635).
proc_set_last_status(STATUS_BUILTIN_OK); proc_set_last_status(STATUS_BUILTIN_OK);

2
src/signal.cpp
View File

@ -17,7 +17,7 @@
#include "wutil.h" // IWYU pragma: keep #include "wutil.h" // IWYU pragma: keep
// This is a temporary var while we explore whether signal_block() and friends is needed. // 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 /// Struct describing an entry for the lookup table used to convert between signal names and signal
/// ids, etc. /// ids, etc.