From a9baa02ed953c0a09afd70632610daba6fe9723b Mon Sep 17 00:00:00 2001 From: sin Date: Sat, 8 Feb 2014 13:00:06 +0000 Subject: No need to use select() - we only have one fd --- sinit.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/sinit.c b/sinit.c index 4939bc5..55a50fd 100644 --- a/sinit.c +++ b/sinit.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -39,9 +38,7 @@ main(void) sigset_t sigset; int sigfd; int i; - int ret; ssize_t n; - fd_set rfds; if (getpid() != 1) return EXIT_FAILURE; @@ -64,23 +61,14 @@ main(void) spawn(rcinitcmd); while (1) { - FD_ZERO(&rfds); - FD_SET(sigfd, &rfds); - ret = select(sigfd + 1, &rfds, NULL, NULL, NULL); - if (ret < 0) - eprintf("sinit: select:"); - if (ret == 0) + n = read(sigfd, &siginfo, sizeof(siginfo)); + if (n < 0) + eprintf("sinit: read:"); + if (n != sizeof(siginfo)) continue; - if (FD_ISSET(sigfd, &rfds)) { - n = read(sigfd, &siginfo, sizeof(siginfo)); - if (n < 0) - eprintf("sinit: read:"); - if (n != sizeof(siginfo)) - continue; - for (i = 0; i < LEN(dispatchsig); i++) - if (dispatchsig[i].sig == siginfo.ssi_signo) - dispatchsig[i].func(); - } + for (i = 0; i < LEN(dispatchsig); i++) + if (dispatchsig[i].sig == siginfo.ssi_signo) + dispatchsig[i].func(); } return EXIT_SUCCESS; -- cgit v1.2.3-54-g00ecf