github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-27 00:28:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch signal table lookups to range-based for loops

Browse Source
This commit is contained in:
ridiculousfish 2019-02-10 12:07:48 -08:00
parent fe73fbdb9a
commit 28e2cfeb4b
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/signal.cpp
View File

@ -32,7 +32,7 @@ struct lookup_entry {
static int block_count = 0; static int block_count = 0;
/// Lookup table used to convert between signal names and signal ids, etc. /// Lookup table used to convert between signal names and signal ids, etc.
static const struct lookup_entry lookup[] = { static const struct lookup_entry signal_table[] = {
#ifdef SIGHUP #ifdef SIGHUP
{SIGHUP, L"SIGHUP", N_(L"Terminal hung up")}, {SIGHUP, L"SIGHUP", N_(L"Terminal hung up")},
#endif #endif
@ -141,7 +141,7 @@ static const struct lookup_entry lookup[] = {
#ifdef SIGUNUSED #ifdef SIGUNUSED
{SIGUNUSED, L"SIGUNUSED", N_(L"Unused signal")}, {SIGUNUSED, L"SIGUNUSED", N_(L"Unused signal")},
#endif #endif
{0, NULL, NULL}}; };
/// Test if \c name is a string describing the signal named \c canonical. /// Test if \c name is a string describing the signal named \c canonical.
static int match_signal_name(const wchar_t *canonical, const wchar_t *name) { static int match_signal_name(const wchar_t *canonical, const wchar_t *name) {
@ -151,9 +151,9 @@ static int match_signal_name(const wchar_t *canonical, const wchar_t *name) {
} }
int wcs2sig(const wchar_t *str) { int wcs2sig(const wchar_t *str) {
for (int i = 0; lookup[i].desc; i++) { for (const auto &data : signal_table) {
if (match_signal_name(lookup[i].name, str)) { if (match_signal_name(data.name, str)) {
return lookup[i].signal; return data.signal;
} }
} }
@ -163,11 +163,9 @@ int wcs2sig(const wchar_t *str) {
} }
const wchar_t *sig2wcs(int sig) { const wchar_t *sig2wcs(int sig) {
int i; for (const auto &data : signal_table) {
if (data.signal == sig) {
for (i = 0; lookup[i].desc; i++) { return data.name;
if (lookup[i].signal == sig) {
return lookup[i].name;
} }
} }
@ -175,11 +173,9 @@ const wchar_t *sig2wcs(int sig) {
} }
const wchar_t *signal_get_desc(int sig) { const wchar_t *signal_get_desc(int sig) {
int i; for (const auto &data : signal_table) {
if (data.signal == sig) {
for (i = 0; lookup[i].desc; i++) { return _(data.desc);
if (lookup[i].signal == sig) {
return _(lookup[i].desc);
} }
} }
@ -255,20 +251,18 @@ static void handle_sigalarm(int sig, siginfo_t *info, void *context) {
} }
void signal_reset_handlers() { void signal_reset_handlers() {
int i;
struct sigaction act; struct sigaction act;
sigemptyset(&act.sa_mask); sigemptyset(&act.sa_mask);
act.sa_flags = 0; act.sa_flags = 0;
act.sa_handler = SIG_DFL; act.sa_handler = SIG_DFL;
for (i = 0; lookup[i].desc; i++) { for (const auto &data : signal_table) {
if (lookup[i].signal == SIGHUP) { if (data.signal == SIGHUP) {
struct sigaction oact; struct sigaction oact;
sigaction(SIGHUP, NULL, &oact); sigaction(SIGHUP, NULL, &oact);
if (oact.sa_handler == SIG_IGN) continue; if (oact.sa_handler == SIG_IGN) continue;
} }
sigaction(lookup[i].signal, &act, NULL); sigaction(data.signal, &act, NULL);
} }
} }
@ -382,14 +376,14 @@ void signal_handle(int sig, int do_handle) {
void get_signals_with_handlers(sigset_t *set) { void get_signals_with_handlers(sigset_t *set) {
sigemptyset(set); sigemptyset(set);
for (int i = 0; lookup[i].desc; i++) { for (const auto &data : signal_table) {
struct sigaction act = {}; struct sigaction act = {};
sigaction(lookup[i].signal, NULL, &act); sigaction(data.signal, NULL, &act);
// If SIGHUP is being ignored (e.g., because were were run via `nohup`) don't reset it. // If SIGHUP is being ignored (e.g., because were were run via `nohup`) don't reset it.
// We don't special case other signals because if they're being ignored that shouldn't // We don't special case other signals because if they're being ignored that shouldn't
// affect processes we spawn. They should get the default behavior for those signals. // affect processes we spawn. They should get the default behavior for those signals.
if (lookup[i].signal == SIGHUP && act.sa_handler == SIG_IGN) continue; if (data.signal == SIGHUP && act.sa_handler == SIG_IGN) continue;
if (act.sa_handler != SIG_DFL) sigaddset(set, lookup[i].signal); if (act.sa_handler != SIG_DFL) sigaddset(set, data.signal);
} }
} }