[PATCH] volume_id fix

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 78da715fec2b5459bab639a7c7b42d64befb3b8c..dfb2baddbc34dfdabbf5264bd9abf587d68304a2 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -20,6 +20,7 @@
  *
  */
 
+#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -58,7 +59,7 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-asmlinkage static void sig_handler(int signum)
+static void asmlinkage sig_handler(int signum)
 {
        switch (signum) {
                case SIGALRM:
@@ -74,24 +75,41 @@ asmlinkage static void sig_handler(int signum)
        }
 }
 
-static char *subsystem_blacklist[] = {
-       "scsi_host",
-       "scsi_device",
-       "usb_host",
-       "pci_bus",
-       "pcmcia_socket",
-       ""
-};
+/* list of subsystems we don't care about. not listing such systems here
+ * is not critical, but it makes it faster as we don't look for the "dev" file
+ */
+static int subsystem_without_dev(const char *subsystem)
+{
+       char *subsystem_blacklist[] = {
+               "scsi_host",
+               "scsi_device",
+               "usb_host",
+               "pci_bus",
+               "pcmcia_socket",
+               "bluetooth",
+               "i2c-adapter",
+               "pci_bus",
+               "ieee1394",
+               "ieee1394_host",
+               "ieee1394_node",
+               NULL
+       };
+       char **subsys;
+
+       for (subsys = subsystem_blacklist; *subsys != NULL; subsys++) {
+               if (strcmp(subsystem, *subsys) == 0)
+                       return 1;
+       }
+
+       return 0;
+}
 
 int main(int argc, char *argv[], char *envp[])
 {
-       main_argv = argv;
-       main_envp = envp;
        struct sigaction act;
-       char *action;
-       char *devpath = "";
-       char *subsystem = "";
-       int i;
+       struct sysfs_class_device *class_dev;
+       struct udevice udev;
+       char path[SYSFS_PATH_MAX];
        int retval = -EINVAL;
        enum {
                ADD,
@@ -101,14 +119,20 @@ int main(int argc, char *argv[], char *envp[])
 
        dbg("version %s", UDEV_VERSION);
 
-       init_logging("udev");
+       main_argv = argv;
+       main_envp = envp;
+
+       logging_init("udev");
 
        udev_init_config();
 
        if (strstr(argv[0], "udevstart")) {
                act_type = UDEVSTART;
        } else {
-               action = get_action();
+               const char *action = get_action();
+               const char *devpath = get_devpath();
+               const char *subsystem = get_subsystem(main_argv[1]);
+
                if (!action) {
                        dbg("no action?");
                        goto exit;
@@ -118,16 +142,15 @@ int main(int argc, char *argv[], char *envp[])
                } else if (strcmp(action, "remove") == 0) {
                        act_type = REMOVE;
                } else {
-                       dbg("unknown action '%s'", action);
+                       dbg("no action '%s' for us", action);
                        goto exit;
                }
 
-               devpath = get_devpath();
                if (!devpath) {
                        dbg("no devpath?");
                        goto exit;
                }
-               dbg("looking at '%s'", devpath);
+               dbg("looking at '%s'", udev.devpath);
 
                /* we only care about class devices and block stuff */
                if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
@@ -135,28 +158,24 @@ int main(int argc, char *argv[], char *envp[])
                        goto exit;
                }
 
-               subsystem = get_subsystem(main_argv[1]);
                if (!subsystem) {
-                       dbg("no subsystem?");
+                       dbg("no subsystem");
                        goto exit;
                }
 
                /* skip blacklisted subsystems */
-               i = 0;
-               while (subsystem_blacklist[i][0] != '\0') {
-                       if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
-                               dbg("don't care about '%s' devices", subsystem);
-                               goto exit;
-                       }
-                       i++;
-               }
+               if (subsystem_without_dev(subsystem)) {
+                       dbg("don't care about '%s' devices", subsystem);
+                       goto exit;
+               };
+
+               udev_set_values(&udev, devpath, subsystem);
        }
 
        /* set signal handlers */
        act.sa_handler = (void (*) (int))sig_handler;
-
        sigemptyset (&act.sa_mask);
-       /* alarm must interrupt syscalls*/
+       /* alarm must not restart syscalls*/
        sigaction(SIGALRM, &act, NULL);
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
@@ -172,21 +191,44 @@ int main(int argc, char *argv[], char *envp[])
        case UDEVSTART:
                dbg("udevstart");
                namedev_init();
-               udev_sleep = 0;
                retval = udev_start();
                break;
        case ADD:
                dbg("udev add");
+
+               /* init rules */
                namedev_init();
-               retval = udev_add_device(devpath, subsystem, NOFAKE);
+
+               /* open the device */
+               snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+               class_dev = sysfs_open_class_device_path(path);
+               if (class_dev == NULL) {
+                       dbg ("sysfs_open_class_device_path failed");
+                       break;
+               }
+               dbg("opened class_dev->name='%s'", class_dev->name);
+
+               /* name, create node, store in db */
+               retval = udev_add_device(&udev, class_dev);
+
+               /* run scripts */
+               dev_d_execute(&udev);
+
+               sysfs_close_class_device(class_dev);
                break;
        case REMOVE:
                dbg("udev remove");
-               retval = udev_remove_device(devpath, subsystem);
+
+               /* get node from db, delete it*/
+               retval = udev_remove_device(&udev);
+
+               /* run scripts */
+               dev_d_execute(&udev);
        }
 
        udevdb_exit();
 
 exit:
+       logging_close();
        return retval;
 }