rule_generator: fix for creating rules on read-only filesystem

[elogind.git] / udevmonitor.c

diff --git a/udevmonitor.c b/udevmonitor.c
index fb1f42cc0164df04a2684f45ff7cc3f36779078a..89053185e03966e9558464cd34edfe92580eee17 100644 (file)
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -1,7 +1,5 @@
 /*
- * udevmonitor.c
- *
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -14,7 +12,7 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -36,8 +34,8 @@
 #include "udev.h"
 #include "udevd.h"
 
-static int uevent_netlink_sock;
-static int udev_monitor_sock;
+static int uevent_netlink_sock = -1;
+static int udev_monitor_sock = -1;
 static volatile int udev_exit;
 
 static int init_udev_monitor_socket(void)
@@ -82,7 +80,7 @@ static int init_uevent_netlink_sock(void)
        memset(&snl, 0x00, sizeof(struct sockaddr_nl));
        snl.nl_family = AF_NETLINK;
        snl.nl_pid = getpid();
-       snl.nl_groups = 0xffffffff;
+       snl.nl_groups = 1;
 
        uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
        if (uevent_netlink_sock == -1) {
@@ -108,6 +106,26 @@ static void asmlinkage sig_handler(int signum)
                udev_exit = 1;
 }
 
+static const char *search_key(const char *searchkey, const char *buf, size_t buflen)
+{
+       size_t bufpos = 0;
+       size_t searchkeylen = strlen(searchkey);
+
+       while (bufpos < buflen) {
+               const char *key;
+               int keylen;
+
+               key = &buf[bufpos];
+               keylen = strlen(key);
+               if (keylen == 0)
+                       break;
+                if ((strncmp(searchkey, key, searchkeylen) == 0) && key[searchkeylen] == '=')
+                       return &key[searchkeylen + 1];
+               bufpos += keylen + 1;
+       }
+       return NULL;
+}
+
 int main(int argc, char *argv[])
 {
        struct sigaction act;
@@ -118,22 +136,21 @@ int main(int argc, char *argv[])
 
        for (i = 1 ; i < argc; i++) {
                char *arg = argv[i];
-               if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0) {
+               if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0)
                        env = 1;
-               }
                else if (strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0){
-                       printf("Usage: udevmonitor [--env]\n"
+                       printf("Usage: udevmonitor [--help] [--env]\n"
                                "  --env    print the whole event environment\n"
                                "  --help   print this help text\n\n");
                        exit(0);
                } else {
-                       fprintf(stderr, "unknown option\n\n");
+                       fprintf(stderr, "unrecognized option '%s'\n", arg);
                        exit(1);
                }
        }
 
        if (getuid() != 0) {
-               fprintf(stderr, "need to be root, exit\n\n");
+               fprintf(stderr, "root privileges required\n");
                exit(2);
        }
 
@@ -148,6 +165,7 @@ int main(int argc, char *argv[])
        retval = init_udev_monitor_socket();
        if (retval)
                goto out;
+
        retval = init_uevent_netlink_sock();
        if (retval)
                goto out;
@@ -156,18 +174,22 @@ int main(int argc, char *argv[])
               "and the event which udev sends out after rule processing [UDEV]\n\n");
 
        while (!udev_exit) {
-               static char buf[UEVENT_BUFFER_SIZE*2];
+               char buf[UEVENT_BUFFER_SIZE*2];
                ssize_t buflen;
+               ssize_t bufpos;
+               ssize_t keys;
                int fdcount;
                struct timeval tv;
                struct timezone tz;
                char timestr[64];
+               const char *source = NULL;
+               const char *devpath, *action, *subsys;
 
                buflen = 0;
                FD_ZERO(&readfds);
-               if (uevent_netlink_sock > 0)
+               if (uevent_netlink_sock >= 0)
                        FD_SET(uevent_netlink_sock, &readfds);
-               if (udev_monitor_sock > 0)
+               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);
@@ -183,35 +205,37 @@ int main(int argc, char *argv[])
                } else
                        timestr[0] = '\0';
 
-               if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
+               if ((uevent_netlink_sock >= 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
                        buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0);
-                       if (buflen <=  0) {
+                       if (buflen <= 0) {
                                fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno));
                                continue;
                        }
-                       printf("UEVENT[%s] %s\n", timestr, buf);
+                       source = "UEVENT";
                }
 
-               if ((udev_monitor_sock > 0) && FD_ISSET(udev_monitor_sock, &readfds)) {
+               if ((udev_monitor_sock >= 0) && FD_ISSET(udev_monitor_sock, &readfds)) {
                        buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0);
-                       if (buflen <=  0) {
+                       if (buflen <= 0) {
                                fprintf(stderr, "error receiving udev message: %s\n", strerror(errno));
                                continue;
                        }
-                       printf("UDEV  [%s] %s\n", timestr, buf);
+                       source = "UDEV  ";
                }
 
                if (buflen == 0)
                        continue;
 
+               keys = strlen(buf) + 1; /* start of payload */
+               devpath = search_key("DEVPATH", &buf[keys], buflen);
+               action = search_key("ACTION", &buf[keys], buflen);
+               subsys = search_key("SUBSYSTEM", &buf[keys], buflen);
+               printf("%s[%s] %-8s %s (%s)\n", source, timestr, action, devpath, subsys);
+
                /* print environment */
+               bufpos = keys;
                if (env) {
-                       size_t bufpos;
-
-                       /* start of payload */
-                       bufpos = strlen(buf) + 1;
-
-                       while (bufpos < (size_t)buflen) {
+                       while (bufpos < buflen) {
                                int keylen;
                                char *key;
 
@@ -227,9 +251,9 @@ int main(int argc, char *argv[])
        }
 
 out:
-       if (uevent_netlink_sock > 0)
+       if (uevent_netlink_sock >= 0)
                close(uevent_netlink_sock);
-       if (udev_monitor_sock > 0)
+       if (udev_monitor_sock >= 0)
                close(udev_monitor_sock);
 
        if (retval)