mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove redundant old state handlers" 

This reverts commit 1590103ab7.
This commit is contained in:
Arun Prakash Jana 2021-06-17 00:31:26 +05:30
parent 0b99247774
commit 239c7e7970
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nnn.c
View File

@ -464,6 +464,10 @@ typedef struct {
static thread_data *core_data;
/* Retain old signal handlers */
static struct sigaction oldsighup;
static struct sigaction oldsigtstp;
/* For use in functions which are isolated and don't return the buffer */
static char g_buf[CMD_LEN_MAX] __attribute__ ((aligned));
@ -1993,8 +1997,8 @@ static pid_t xfork(uchar_t flag)
if (p > 0) {
/* the parent ignores the interrupt, quit and hangup signals */
sigaction(SIGHUP, &(struct sigaction){.sa_handler = SIG_IGN}, NULL);
sigaction(SIGTSTP, &(struct sigaction){.sa_handler = SIG_DFL}, NULL);
sigaction(SIGHUP, &(struct sigaction){.sa_handler = SIG_IGN}, &oldsighup);
sigaction(SIGTSTP, &(struct sigaction){.sa_handler = SIG_DFL}, &oldsigtstp);
} else if (p == 0) {
/* We create a grandchild to detach */
if (flag & F_NOWAIT) {
@ -2041,8 +2045,8 @@ static int join(pid_t p, uchar_t flag)
}
/* restore parent's signal handling */
sigaction(SIGHUP, &(struct sigaction){.sa_handler = clean_exit_sighandler}, NULL);
sigaction(SIGTSTP, &(struct sigaction){.sa_handler = clean_exit_sighandler}, NULL);
sigaction(SIGHUP, &oldsighup, NULL);
sigaction(SIGTSTP, &oldsigtstp, NULL);
return status;
}