chiark / gitweb /
[PATCH] make the udev object available to more processing stages
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index 0ef4cf8657f17d79e0bf3628fb7a5ec15e7ff8c6..300e85ceb0aa0737c74f589cc39de53e43ed6f41 100644 (file)
--- a/udev.c
+++ b/udev.c
 #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"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
-
-/* local variables */
-static int is_udevstart;
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -58,133 +54,133 @@ 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:
+                       exit(1);
                case SIGINT:
                case SIGTERM:
-                       udevdb_exit();
                        exit(20 + signum);
-               default:
-                       dbg("unhandled signal %d", signum);
        }
 }
 
-static char *subsystem_blacklist[] = {
-       "scsi_host",
-       "scsi_device",
-       "usb_host",
-       "pci_bus",
-       "pcmcia_socket",
-       ""
-};
-
-int __udev_hotplug(char *action, const char *devpath, const char *subsystem)
+int main(int argc, char *argv[], char *envp[])
 {
-       int retval = -EINVAL;
-       int i;
        struct sigaction act;
-       const int nofake = 0;
+       struct sysfs_class_device *class_dev;
+       struct udevice udev;
+       char path[SYSFS_PATH_MAX];
+       int retval = -EINVAL;
+       enum {
+               ADD,
+               REMOVE,
+               UDEVSTART,
+       } act_type;
 
-       dbg("looking at '%s'", devpath);
+       dbg("version %s", UDEV_VERSION);
+       logging_init("udev");
+       udev_init_config();
 
-       /* we only care about class devices and block stuff */
-       if (!strstr(devpath, "class") &&
-           !strstr(devpath, "block")) {
-               dbg("not a block or class device");
-               goto exit;
-       }
+       if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
+               act_type = UDEVSTART;
+       } else {
+               const char *action = getenv("ACTION");
+               const char *devpath = getenv("DEVPATH");
+               const char *subsystem = argv[1];
 
-       i = 0;
-       while (subsystem_blacklist[i][0] != '\0') {
-               if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
-                       dbg("don't care about '%s' devices", subsystem);
+               if (!action) {
+                       dbg("no action?");
                        goto exit;
                }
-               i++;
-       }
+               if (strcmp(action, "add") == 0) {
+                       act_type = ADD;
+               } else if (strcmp(action, "remove") == 0) {
+                       act_type = REMOVE;
+               } else {
+                       dbg("no action '%s' for us", action);
+                       goto exit;
+               }
+
+               if (!devpath) {
+                       dbg("no devpath?");
+                       goto exit;
+               }
+               dbg("looking at '%s'", devpath);
+
+               /* we only care about class devices and block stuff */
+               if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
+                       dbg("not a block or class device");
+                       goto exit;
+               }
+
+               if (!subsystem) {
+                       dbg("no subsystem");
+                       goto exit;
+               }
+
+               udev_set_values(&udev, devpath, subsystem, action);
+
+               /* skip blacklisted subsystems */
+               if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
+                       dbg("don't care about '%s' devices", subsystem);
+                       goto exit;
+               };
 
-       /* initialize udev database */
-       retval = udevdb_init(UDEVDB_DEFAULT);
-       if (retval != 0) {
-               dbg("unable to initialize database");
-               goto exit;
        }
 
        /* set signal handlers */
-       act.sa_handler = sig_handler;
+       act.sa_handler = (void (*) (int))sig_handler;
        sigemptyset (&act.sa_mask);
-       act.sa_flags = SA_RESTART;
+       act.sa_flags = 0;
+       /* alarm must not restart syscalls*/
+       sigaction(SIGALRM, &act, NULL);
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
 
-       if (strcmp(action, "add") == 0) {
-               /* Already done. */
-               if (!is_udevstart)
-                       namedev_init();
-               retval = udev_add_device(devpath, subsystem, nofake);
-               goto action_done;
-       }
+       /* trigger timout to interrupt blocking syscalls */
+       alarm(ALARM_TIMEOUT);
 
-       if (strcmp(action, "remove") == 0) {
-               retval = udev_remove_device(devpath, subsystem);
-               goto action_done;
-       }
+       switch(act_type) {
+       case UDEVSTART:
+               dbg("udevstart");
+               namedev_init();
+               retval = udev_start();
+               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);
 
-       dbg("unknown action '%s'", action);
-       retval = -EINVAL;
+               /* init rules */
+               namedev_init();
 
-action_done:
-       udevdb_exit();
+               /* name, create node, store in db */
+               retval = udev_add_device(&udev, class_dev);
 
-exit:
-       return retval;
-}
+               /* run scripts */
+               dev_d_execute(&udev);
 
-static int udev_hotplug(void)
-{
-       char *action;
-       char *devpath;
-       char *subsystem;
-
-       action = get_action();
-       if (!action) {
-               dbg("no action?");
-               return -EINVAL;
-       }
+               sysfs_close_class_device(class_dev);
+               break;
+       case REMOVE:
+               dbg("udev remove");
 
-       devpath = get_devpath();
-       if (!devpath) {
-               dbg("no devpath?");
-               return -EINVAL;
-       }
+               /* get node from db, delete it*/
+               retval = udev_remove_device(&udev);
 
-       /* skip blacklisted subsystems */
-       subsystem = get_subsystem(main_argv[1]);
-       if (!subsystem) {
-               dbg("no subsystem?");
-               return -EINVAL;
+               /* run scripts */
+               dev_d_execute(&udev);
        }
 
-       return __udev_hotplug(action, devpath, subsystem);
-}
-
-int main(int argc, char *argv[], char *envp[])
-{
-       main_argv = argv;
-       main_envp = envp;
-
-       if (strstr(argv[0], "udevstart"))
-               is_udevstart = 1;
-
-       /* initialize our configuration */
-       udev_init_config();
-
-       dbg("version %s", UDEV_VERSION);
-
-       if (is_udevstart) {
-               namedev_init();
-               return udev_start();
-       } else
-               return udev_hotplug();
+exit:
+       logging_close();
+       return retval;
 }