Use sigaction

This commit is contained in:
Arun Prakash Jana 2019-02-09 00:08:46 +05:30
parent 027af53ae0
commit 1253e462b8
No known key found for this signature in database
GPG key ID: A75979F35C080412

View file

@ -539,7 +539,7 @@ static uchar crc8fast(uchar const message[], size_t n)
return remainder; return remainder;
} }
static void signal_handler(int signum) static void sigint_handler(int sig, siginfo_t *siginfo, void *context)
{ {
interrupted = TRUE; interrupted = TRUE;
} }
@ -2961,7 +2961,6 @@ begin:
populate(path, lastname); populate(path, lastname);
if (interrupted) { if (interrupted) {
interrupted = FALSE; interrupted = FALSE;
signal(SIGINT, &signal_handler);
cfg.apparentsz = 0; cfg.apparentsz = 0;
cfg.blkorder = 0; cfg.blkorder = 0;
BLK_SHIFT = 9; BLK_SHIFT = 9;
@ -4222,8 +4221,14 @@ int main(int argc, char *argv[])
if (getenv(env_cfg[NNN_RESTRICT_0B])) if (getenv(env_cfg[NNN_RESTRICT_0B]))
cfg.restrict0b = 1; cfg.restrict0b = 1;
/* Ignore certain signals */ /* Ignore/handle certain signals */
signal(SIGINT, &signal_handler); struct sigaction act = {0};
act.sa_sigaction = &sigint_handler;
act.sa_flags = SA_SIGINFO;
if (sigaction(SIGINT, &act, NULL) < 0) {
fprintf(stderr, "sigaction\n");
return 1;
}
signal(SIGQUIT, SIG_IGN); signal(SIGQUIT, SIG_IGN);
/* Test initial path */ /* Test initial path */