[PATCH] Don't use any syslog() in signal handler, cause it may deadlock.

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index d98a017396e0b33fa896d9336fcaf7ed289de011..78090605206f1fab763c4a1dccb21d485967940b 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,10 +27,12 @@
 #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"
@@ -64,54 +65,19 @@ static void asmlinkage sig_handler(int signum)
        switch (signum) {
                case SIGALRM:
                        gotalarm = 1;
-                       info("error: timeout reached, event probably not handled correctly");
                        break;
                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[])
 {
-       main_argv = argv;
-       main_envp = envp;
        struct sigaction act;
-       char *action;
-       char *devpath = "";
-       char *subsystem = "";
+       struct sysfs_class_device *class_dev;
+       struct udevice udev;
+       char path[SYSFS_PATH_MAX];
        int retval = -EINVAL;
        enum {
                ADD,
@@ -121,14 +87,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;
@@ -138,11 +110,10 @@ 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;
@@ -155,22 +126,25 @@ 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;
                }
 
+               udev_set_values(&udev, devpath, subsystem);
+
                /* 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);
-                       exit(0);
+                       goto exit;
                };
+
        }
 
        /* 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);
@@ -191,16 +165,40 @@ int main(int argc, char *argv[], char *envp[])
                break;
        case ADD:
                dbg("udev add");
+
+               /* 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);
+
+               /* init rules */
                namedev_init();
-               retval = udev_add_device(devpath, subsystem, NOFAKE);
+
+               /* 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;
 }