[PATCH] make the udev object available to more processing stages

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index dfb2baddbc34dfdabbf5264bd9abf587d68304a2..300e85ceb0aa0737c74f589cc39de53e43ed6f41 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -28,21 +27,17 @@
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_lib.h"
+#include "udev_sysfs.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 
-/* timeout flag for udevdb */
-extern sig_atomic_t gotalarm;
-
-/* global variables */
-char **main_argv;
-char **main_envp;
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -63,45 +58,11 @@ static void asmlinkage sig_handler(int signum)
 {
        switch (signum) {
                case SIGALRM:
-                       gotalarm = 1;
-                       info("error: timeout reached, event probably not handled correctly");
-                       break;
+                       exit(1);
                case SIGINT:
                case SIGTERM:
-                       udevdb_exit();
                        exit(20 + signum);
-               default:
-                       dbg("unhandled signal %d", signum);
-       }
-}
-
-/* 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[])
@@ -118,20 +79,15 @@ int main(int argc, char *argv[], char *envp[])
        } act_type;
 
        dbg("version %s", UDEV_VERSION);
-
-       main_argv = argv;
-       main_envp = envp;
-
        logging_init("udev");
-
        udev_init_config();
 
-       if (strstr(argv[0], "udevstart")) {
+       if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
                act_type = UDEVSTART;
        } else {
-               const char *action = get_action();
-               const char *devpath = get_devpath();
-               const char *subsystem = get_subsystem(main_argv[1]);
+               const char *action = getenv("ACTION");
+               const char *devpath = getenv("DEVPATH");
+               const char *subsystem = argv[1];
 
                if (!action) {
                        dbg("no action?");
@@ -150,7 +106,7 @@ int main(int argc, char *argv[], char *envp[])
                        dbg("no devpath?");
                        goto exit;
                }
-               dbg("looking at '%s'", udev.devpath);
+               dbg("looking at '%s'", devpath);
 
                /* we only care about class devices and block stuff */
                if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
@@ -163,18 +119,20 @@ int main(int argc, char *argv[], char *envp[])
                        goto exit;
                }
 
+               udev_set_values(&udev, devpath, subsystem, action);
+
                /* skip blacklisted subsystems */
-               if (subsystem_without_dev(subsystem)) {
+               if (udev.type != 'n' && subsystem_expect_no_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);
+       act.sa_flags = 0;
        /* alarm must not restart syscalls*/
        sigaction(SIGALRM, &act, NULL);
        sigaction(SIGINT, &act, NULL);
@@ -183,10 +141,6 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timout to interrupt blocking syscalls */
        alarm(ALARM_TIMEOUT);
 
-       /* initialize udev database */
-       if (udevdb_init(UDEVDB_DEFAULT) != 0)
-               info("error: unable to initialize database, continuing without database");
-
        switch(act_type) {
        case UDEVSTART:
                dbg("udevstart");
@@ -196,9 +150,6 @@ int main(int argc, char *argv[], char *envp[])
        case ADD:
                dbg("udev add");
 
-               /* init rules */
-               namedev_init();
-
                /* open the device */
                snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
                class_dev = sysfs_open_class_device_path(path);
@@ -208,6 +159,9 @@ int main(int argc, char *argv[], char *envp[])
                }
                dbg("opened class_dev->name='%s'", class_dev->name);
 
+               /* init rules */
+               namedev_init();
+
                /* name, create node, store in db */
                retval = udev_add_device(&udev, class_dev);
 
@@ -226,8 +180,6 @@ int main(int argc, char *argv[], char *envp[])
                dev_d_execute(&udev);
        }
 
-       udevdb_exit();
-
 exit:
        logging_close();
        return retval;