[PATCH] remove sleeps from udev as it is external now

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 94888d6a43a008f4fcfa4a4b49f0988acf0e1894..d98a017396e0b33fa896d9336fcaf7ed289de011 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>
@@ -74,14 +75,34 @@ static void asmlinkage 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[])
 {
@@ -91,7 +112,6 @@ int main(int argc, char *argv[], char *envp[])
        char *action;
        char *devpath = "";
        char *subsystem = "";
-       int i;
        int retval = -EINVAL;
        enum {
                ADD,
@@ -142,21 +162,16 @@ int main(int argc, char *argv[], char *envp[])
                }
 
                /* 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);
+                       exit(0);
+               };
        }
 
        /* 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,7 +187,6 @@ int main(int argc, char *argv[], char *envp[])
        case UDEVSTART:
                dbg("udevstart");
                namedev_init();
-               udev_sleep = 0;
                retval = udev_start();
                break;
        case ADD: