uloop: add back support for overriding signal handlers when signalfd is in use

[project/libubox.git] / uloop-epoll.c

diff --git a/uloop-epoll.c b/uloop-epoll.c
index 9581e12..2d1c4a7 100644 (file)
--- a/uloop-epoll.c
+++ b/uloop-epoll.c
@@ -29,6 +29,7 @@ static void
 uloop_signal_fd_cb(struct uloop_fd *fd, unsigned int events)
 {
        struct signalfd_siginfo fdsi;
+       struct sigaction act;
        int ret;
 
 retry:
@@ -39,7 +40,22 @@ retry:
        if (ret != sizeof(fdsi))
                return;
 
-       uloop_handle_signal(fdsi.ssi_signo);
+       switch (fdsi.ssi_signo) {
+       case SIGQUIT:
+       case SIGINT:
+       case SIGTERM:
+               sigaction(fdsi.ssi_signo, NULL, &act);
+               if (act.sa_handler != SIG_IGN &&
+                       act.sa_handler != SIG_DFL) {
+                       act.sa_handler(fdsi.ssi_signo);
+                       break;
+               }
+
+               /* fall through */
+       default:
+               uloop_handle_signal(fdsi.ssi_signo);
+               break;
+       }
 }
 
 static bool