udevinfo: restore -d option

[elogind.git] / udevmonitor.c

diff --git a/udevmonitor.c b/udevmonitor.c
index 2efb705b6d945e87e035e6645c810a289aa1466d..33dff2a13c3e7e8fa9947d904ba5493d9e593a9c 100644 (file)
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <errno.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/select.h>
@@ -38,6 +39,7 @@
 
 static int uevent_netlink_sock;
 static int udev_monitor_sock;
+static volatile int udev_exit;
 
 static int init_udev_monitor_socket(void)
 {
@@ -63,6 +65,7 @@ static int init_udev_monitor_socket(void)
        if (retval < 0) {
                fprintf(stderr, "bind failed, %s\n", strerror(errno));
                close(udev_monitor_sock);
+               udev_monitor_sock = -1;
                return -1;
        }
 
@@ -100,12 +103,19 @@ static int init_uevent_netlink_sock(void)
        return 0;
 }
 
+static void asmlinkage sig_handler(int signum)
+{
+       if (signum == SIGINT || signum == SIGTERM)
+               udev_exit = 1;
+}
+
 int main(int argc, char *argv[])
 {
+       struct sigaction act;
        int env = 0;
        fd_set readfds;
        int i;
-       int retval;
+       int retval = 0;
 
        for (i = 1 ; i < argc; i++) {
                char *arg = argv[i];
@@ -125,37 +135,47 @@ int main(int argc, char *argv[])
 
        if (getuid() != 0) {
                fprintf(stderr, "need to be root, exit\n\n");
-               exit(1);
+               exit(2);
        }
 
-       init_uevent_netlink_sock();
-       init_udev_monitor_socket();
-
-       printf("udevmonitor prints received from the kernel [UEVENT] and after\n"
-              "the udev processing, the event which udev [UDEV] has generated\n\n");
-
-       FD_ZERO(&readfds);
-       if (uevent_netlink_sock > 0)
-               FD_SET(uevent_netlink_sock, &readfds);
-       if (udev_monitor_sock > 0)
-               FD_SET(udev_monitor_sock, &readfds);
-
-       while (1) {
+       /* set signal handlers */
+       memset(&act, 0x00, sizeof(struct sigaction));
+       act.sa_handler = (void (*)(int)) sig_handler;
+       sigemptyset(&act.sa_mask);
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
+
+       retval = init_udev_monitor_socket();
+       if (retval)
+               goto out;
+       retval = init_uevent_netlink_sock();
+       if (retval)
+               goto out;
+
+       printf("udevmonitor prints the received event from the kernel [UEVENT]\n"
+              "and the event which udev sends out after rule processing [UDEV]\n\n");
+
+       while (!udev_exit) {
                static char buf[UEVENT_BUFFER_SIZE*2];
                ssize_t buflen;
-               fd_set workreadfds;
+               int fdcount;
 
                buflen = 0;
-               workreadfds = readfds;
-
-               retval = select(UDEV_MAX(uevent_netlink_sock, udev_monitor_sock)+1, &workreadfds, NULL, NULL, NULL);
-               if (retval < 0) {
+               FD_ZERO(&readfds);
+               if (uevent_netlink_sock > 0)
+                       FD_SET(uevent_netlink_sock, &readfds);
+               if (udev_monitor_sock > 0)
+                       FD_SET(udev_monitor_sock, &readfds);
+
+               fdcount = select(UDEV_MAX(uevent_netlink_sock, udev_monitor_sock)+1, &readfds, NULL, NULL, NULL);
+               if (fdcount < 0) {
                        if (errno != EINTR)
                                fprintf(stderr, "error receiving uevent message\n");
                        continue;
                }
 
-               if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &workreadfds)) {
+               if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
                        buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0);
                        if (buflen <=  0) {
                                fprintf(stderr, "error receiving uevent message\n");
@@ -164,7 +184,7 @@ int main(int argc, char *argv[])
                        printf("UEVENT[%i] %s\n", time(NULL), buf);
                }
 
-               if ((udev_monitor_sock > 0) && FD_ISSET(udev_monitor_sock, &workreadfds)) {
+               if ((udev_monitor_sock > 0) && FD_ISSET(udev_monitor_sock, &readfds)) {
                        buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0);
                        if (buflen <=  0) {
                                fprintf(stderr, "error receiving udev message\n");
@@ -198,9 +218,13 @@ int main(int argc, char *argv[])
                }
        }
 
+out:
        if (uevent_netlink_sock > 0)
                close(uevent_netlink_sock);
        if (udev_monitor_sock > 0)
                close(udev_monitor_sock);
-       exit(1);
+
+       if (retval)
+               return 3;
+       return 0;
 }