chiark / gitweb /
fix udevinfo output
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index ce9b42f30db510519cc6c0d9f7f8883cbd15e4cb..ecfd5644ec5f28ba87c970fe23c823eeb1197ff6 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -1,10 +1,8 @@
 /*
  * udev.c
  *
- * Userspace devfs
- *
- * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -54,35 +52,6 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
-/* decide if we should manage the whole hotplug event
- * for now look if the kernel calls udevsend instead of /sbin/hotplug
- */
-static int manage_hotplug_event(void) {
-       char helper[256];
-       int fd;
-       int len;
-
-       /* don't handle hotplug.d if we are called directly */
-       if (!getenv("UDEVD_EVENT"))
-               return 0;
-
-       fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
-       if (fd < 0)
-               return 0;
-
-       len = read(fd, helper, 256);
-       close(fd);
-
-       if (len < 0)
-               return 0;
-       helper[len] = '\0';
-
-       if (strstr(helper, "udevsend"))
-               return 1;
-
-       return 0;
-}
-
 static void asmlinkage sig_handler(int signum)
 {
        switch (signum) {
@@ -96,15 +65,11 @@ static void asmlinkage sig_handler(int signum)
 
 int main(int argc, char *argv[], char *envp[])
 {
-       struct sysfs_class_device *class_dev;
-       struct sysfs_device *devices_dev;
        struct udevice udev;
-       char path[PATH_SIZE];
-       const char *error;
+       struct udev_rules rules;
        const char *action;
        const char *devpath;
        const char *subsystem;
-       int managed_event;
        struct sigaction act;
        int retval = -EINVAL;
 
@@ -127,12 +92,7 @@ int main(int argc, char *argv[], char *envp[])
        sigaction(SIGTERM, &act, NULL);
 
        /* trigger timeout to prevent hanging processes */
-       alarm(ALARM_TIMEOUT);
-
-       /* let the executed programs know if we handle the whole hotplug event */
-       managed_event = manage_hotplug_event();
-       if (managed_event)
-               setenv("MANAGED_EVENT", "1", 1);
+       alarm(UDEV_ALARM_TIMEOUT);
 
        action = getenv("ACTION");
        devpath = getenv("DEVPATH");
@@ -141,14 +101,12 @@ int main(int argc, char *argv[], char *envp[])
        if (!subsystem && argc == 2)
                subsystem = argv[1];
 
-       udev_init_device(&udev, devpath, subsystem, action);
-
        if (!action || !subsystem || !devpath) {
                err("action, subsystem or devpath missing");
-               goto hotplug;
+               goto exit;
        }
 
-       /* export logging flag, as called scripts may want to do the same as udev */
+       /* export log_priority , as called programs may want to do the same as udev */
        if (udev_log_priority) {
                char priority[32];
 
@@ -156,99 +114,27 @@ int main(int argc, char *argv[], char *envp[])
                setenv("UDEV_LOG", priority, 1);
        }
 
-       if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
-               udev_rules_init();
-
-               if (strcmp(action, "add") == 0) {
-                       /* wait for sysfs and possibly add node */
-                       dbg("udev add");
-
-                       /* skip subsystems without "dev", but handle net devices */
-                       if (udev.type != DEV_NET && subsystem_expect_no_dev(udev.subsystem)) {
-                               dbg("don't care about '%s' devices", udev.subsystem);
-                               goto hotplug;
-                       }
-
-                       snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
-                       path[sizeof(path)-1] = '\0';
-                       class_dev = wait_class_device_open(path);
-                       if (class_dev == NULL) {
-                               dbg("open class device failed");
-                               goto hotplug;
-                       }
-                       dbg("opened class_dev->name='%s'", class_dev->name);
-
-                       wait_for_class_device(class_dev, &error);
-
-                       /* name, create node, store in db */
-                       retval = udev_add_device(&udev, class_dev);
-
-                       sysfs_close_class_device(class_dev);
-               } else if (strcmp(action, "remove") == 0) {
-                       /* possibly remove a node */
-                       dbg("udev remove");
-
-                       /* skip subsystems without "dev" */
-                       if (subsystem_expect_no_dev(udev.subsystem)) {
-                               dbg("don't care about '%s' devices", udev.subsystem);
-                               goto hotplug;
-                       }
-
-                       udev_rules_get_run(&udev);
-                       if (udev.ignore_device) {
-                               dbg("device event will be ignored");
-                               goto hotplug;
-                       }
-
-                       /* get node from db, remove db-entry, delete created node */
-                       retval = udev_remove_device(&udev);
-               }
-
-               if (udev.devname[0] != '\0')
-                       setenv("DEVNAME", udev.devname, 1);
+       udev_init_device(&udev, devpath, subsystem, action);
+       udev_rules_init(&rules, 1, 0);
 
-               if (udev_run && !list_empty(&udev.run_list)) {
-                       struct name_entry *name_loop;
+       retval = udev_process_event(&rules, &udev);
 
-                       dbg("executing run list");
-                       list_for_each_entry(name_loop, &udev.run_list, node)
-                               execute_command(name_loop->name, udev.subsystem);
-               }
+       if (!retval && udev_run && !list_empty(&udev.run_list)) {
+               struct name_entry *name_loop;
 
-               /* run dev.d/ scripts if we created/deleted a node or changed a netif name */
-               if (udev_dev_d && udev.devname[0] != '\0')
-                       udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
-
-       } else if (udev.type == DEV_DEVICE) {
-               if (strcmp(action, "add") == 0) {
-                       /* wait for sysfs */
-                       dbg("devices add");
-
-                       snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath);
-                       path[sizeof(path)-1] = '\0';
-                       devices_dev = wait_devices_device_open(path);
-                       if (!devices_dev) {
-                               dbg("devices device unavailable (probably remove has beaten us)");
-                               goto hotplug;
-                       }
-                       dbg("devices device opened '%s'", path);
-
-                       wait_for_devices_device(devices_dev, &error);
-
-                       sysfs_close_device(devices_dev);
-               } else if (strcmp(action, "remove") == 0) {
-                       dbg("devices remove");
+               dbg("executing run list");
+               list_for_each_entry(name_loop, &udev.run_list, node) {
+                       if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
+                               pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, action);
+                       else
+                               execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
                }
-       } else {
-               dbg("unhandled");
        }
 
-hotplug:
-       if (udev_hotplug_d && managed_event)
-               udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
-
+       udev_rules_close(&rules);
        udev_cleanup_device(&udev);
 
+exit:
        logging_close();
        return retval;
 }