mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #607 from leovilok/signals

Browse source 
Cleanly handle SIGTERM and SIGHUP
This commit is contained in:
Mischievous Meerkat 2020-05-30 05:08:45 +05:30 committed by GitHub
parent 41dc17883a 75e8bf44be
commit e47a04865e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/nnn.c
View file

@ -372,14 +372,8 @@ static regex_t archive_re;
#endif #endif
/* Retain old signal handlers */ /* Retain old signal handlers */
#ifdef __linux__ static struct sigaction oldsighup;
static sighandler_t oldsighup; /* old value of hangup signal */ static struct sigaction oldsigtstp;
static sighandler_t oldsigtstp; /* old value of SIGTSTP */
#else
/* note: no sig_t on Solaris-derivs */
static void (*oldsighup)(int);
static void (*oldsigtstp)(int);
#endif
/* For use in functions which are isolated and don't return the buffer */ /* For use in functions which are isolated and don't return the buffer */
static char g_buf[CMD_LEN_MAX] __attribute__ ((aligned)); static char g_buf[CMD_LEN_MAX] __attribute__ ((aligned));
@ -704,6 +698,13 @@ static void sigint_handler(int UNUSED(sig))
g_states |= STATE_INTERRUPTED; g_states |= STATE_INTERRUPTED;
} }
static void clean_exit_sighandler(int UNUSED(sig))
{
exitcurses();
/* This triggers cleanup() thanks to atexit() */
exit(EXIT_SUCCESS);
}
static char *xitoa(uint val) static char *xitoa(uint val)
{ {
static char ascbuf[32] = {0}; static char ascbuf[32] = {0};
@ -1579,11 +1580,12 @@ static pid_t xfork(uchar flag)
{ {
int status; int status;
pid_t p = fork(); pid_t p = fork();
struct sigaction dfl_act = {.sa_handler = SIG_DFL};
if (p > 0) { if (p > 0) {
/* the parent ignores the interrupt, quit and hangup signals */ /* the parent ignores the interrupt, quit and hangup signals */
oldsighup = signal(SIGHUP, SIG_IGN); sigaction(SIGHUP, &(struct sigaction){.sa_handler = SIG_IGN}, &oldsighup);
oldsigtstp = signal(SIGTSTP, SIG_DFL); sigaction(SIGTSTP, &dfl_act, &oldsigtstp);
} else if (p == 0) { } else if (p == 0) {
/* We create a grandchild to detach */ /* We create a grandchild to detach */
if (flag & F_NOWAIT) { if (flag & F_NOWAIT) {
@ -1592,10 +1594,10 @@ static pid_t xfork(uchar flag)
if (p > 0) if (p > 0)
_exit(EXIT_SUCCESS); _exit(EXIT_SUCCESS);
else if (p == 0) { else if (p == 0) {
signal(SIGHUP, SIG_DFL); sigaction(SIGHUP, &dfl_act, NULL);
signal(SIGINT, SIG_DFL); sigaction(SIGINT, &dfl_act, NULL);
signal(SIGQUIT, SIG_DFL); sigaction(SIGQUIT, &dfl_act, NULL);
signal(SIGTSTP, SIG_DFL); sigaction(SIGTSTP, &dfl_act, NULL);
setsid(); setsid();
return p; return p;
@ -1606,10 +1608,10 @@ static pid_t xfork(uchar flag)
} }
/* so they can be used to stop the child */ /* so they can be used to stop the child */
signal(SIGHUP, SIG_DFL); sigaction(SIGHUP, &dfl_act, NULL);
signal(SIGINT, SIG_DFL); sigaction(SIGINT, &dfl_act, NULL);
signal(SIGQUIT, SIG_DFL); sigaction(SIGQUIT, &dfl_act, NULL);
signal(SIGTSTP, SIG_DFL); sigaction(SIGTSTP, &dfl_act, NULL);
} }
/* This is the parent waiting for the child to create grandchild*/ /* This is the parent waiting for the child to create grandchild*/
@ -1637,8 +1639,8 @@ static int join(pid_t p, uchar flag)
} }
/* restore parent's signal handling */ /* restore parent's signal handling */
signal(SIGHUP, oldsighup); sigaction(SIGHUP, &oldsighup, NULL);
signal(SIGTSTP, oldsigtstp); sigaction(SIGTSTP, &oldsigtstp, NULL);
return status; return status;
} }
@ -7196,7 +7198,7 @@ int main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
signal(SIGPIPE, SIG_IGN); sigaction(SIGPIPE, &(struct sigaction){.sa_handler = SIG_IGN}, NULL);
} }
#endif #endif
@ -7232,7 +7234,20 @@ int main(int argc, char *argv[])
xerror(); xerror();
return EXIT_FAILURE; return EXIT_FAILURE;
} }
signal(SIGQUIT, SIG_IGN);
act.sa_handler = clean_exit_sighandler;
if (sigaction(SIGTERM, &act, NULL) < 0 || sigaction(SIGHUP, &act, NULL) < 0) {
xerror();
return EXIT_FAILURE;
}
act.sa_handler = SIG_IGN;
if (sigaction(SIGQUIT, &act, NULL) < 0) {
xerror();
return EXIT_FAILURE;
}
#ifndef NOLOCALE #ifndef NOLOCALE
/* Set locale */ /* Set locale */