diff options
| author |  Miklos Szeredi <mszeredi@suse.cz> | 2015-02-26 16:57:41 +0100 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2015-02-26 16:57:41 +0100 |
| commit | f2f4d1c312784a5909bb931cc8d68287c8c81326 (patch) | |
| tree | a7fff9d2e5087108ec9e414be6abd671d1004056 /lib/fuse_signals.c | |
| parent | e0fa9c41fd5c2639dd23fbb151e251fcc1303a5b (diff) | |
libfuse: fix fuse_remove_signal_handlers()
to properly restore the default signal handler.
Reported by: Chris Johnson <johnsocg@gmail.com>
Diffstat (limited to 'lib/fuse_signals.c')
| -rwxr-xr-x | lib/fuse_signals.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/fuse_signals.c b/lib/fuse_signals.c index c78c62d..b992b71 100755 --- a/lib/fuse_signals.c +++ b/lib/fuse_signals.c @@ -24,13 +24,13 @@ static void exit_handler(int sig) } /*! [doxygen_exit_handler] */ -static int set_one_signal_handler(int sig, void (*handler)(int)) +static int set_one_signal_handler(int sig, void (*handler)(int), int remove) { struct sigaction sa; struct sigaction old_sa; memset(&sa, 0, sizeof(struct sigaction)); - sa.sa_handler = handler; + sa.sa_handler = remove ? SIG_DFL : handler; sigemptyset(&(sa.sa_mask)); sa.sa_flags = 0; @@ -39,7 +39,7 @@ static int set_one_signal_handler(int sig, void (*handler)(int)) return -1; } - if (old_sa.sa_handler == SIG_DFL && + if (old_sa.sa_handler == (remove ? handler : SIG_DFL) && sigaction(sig, &sa, NULL) == -1) { perror("fuse: cannot set signal handler"); return -1; @@ -49,10 +49,10 @@ static int set_one_signal_handler(int sig, void (*handler)(int)) int fuse_set_signal_handlers(struct fuse_session *se) { - if (set_one_signal_handler(SIGHUP, exit_handler) == -1 || - set_one_signal_handler(SIGINT, exit_handler) == -1 || - set_one_signal_handler(SIGTERM, exit_handler) == -1 || - set_one_signal_handler(SIGPIPE, SIG_IGN) == -1) + if (set_one_signal_handler(SIGHUP, exit_handler, 0) == -1 || + set_one_signal_handler(SIGINT, exit_handler, 0) == -1 || + set_one_signal_handler(SIGTERM, exit_handler, 0) == -1 || + set_one_signal_handler(SIGPIPE, SIG_IGN, 0) == -1) return -1; fuse_instance = se; @@ -67,9 +67,9 @@ void fuse_remove_signal_handlers(struct fuse_session *se) else fuse_instance = NULL; - set_one_signal_handler(SIGHUP, SIG_DFL); - set_one_signal_handler(SIGINT, SIG_DFL); - set_one_signal_handler(SIGTERM, SIG_DFL); - set_one_signal_handler(SIGPIPE, SIG_DFL); + set_one_signal_handler(SIGHUP, exit_handler, 1); + set_one_signal_handler(SIGINT, exit_handler, 1); + set_one_signal_handler(SIGTERM, exit_handler, 1); + set_one_signal_handler(SIGPIPE, SIG_IGN, 1); } |