allow RUN to send the environment to a local socket

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 67d081d00560c375684b4be202598e70afe5268a..2a6e1efc9932e1699b9f0b69e3b2222a12f8a9a0 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
@@ -68,8 +66,7 @@ static void asmlinkage sig_handler(int signum)
 int main(int argc, char *argv[], char *envp[])
 {
        struct udevice udev;
-       char path[PATH_SIZE];
-       const char *error;
+       struct udev_rules rules;
        const char *action;
        const char *devpath;
        const char *subsystem;
@@ -95,7 +92,7 @@ int main(int argc, char *argv[], char *envp[])
        sigaction(SIGTERM, &act, NULL);
 
        /* trigger timeout to prevent hanging processes */
-       alarm(ALARM_TIMEOUT);
+       alarm(UDEV_ALARM_TIMEOUT);
 
        action = getenv("ACTION");
        devpath = getenv("DEVPATH");
@@ -118,108 +115,22 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        udev_init_device(&udev, devpath, subsystem, action);
-       udev_rules_init();
-
-       if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
-               /* handle device node */
-               if (strcmp(action, "add") == 0) {
-                       struct sysfs_class_device *class_dev;
-
-                       /* wait for sysfs of /sys/class /sys/block */
-                       dbg("node add");
-                       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 run;
-                       }
-                       dbg("opened class_dev->name='%s'", class_dev->name);
-                       wait_for_class_device(class_dev, &error);
-
-                       /* get major/minor */
-                       if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS)
-                               udev.devt = get_devt(class_dev);
-
-                       if (udev.type == DEV_NET || udev.devt) {
-                               /* name device */
-                               udev_rules_get_name(&udev, class_dev);
-                               if (udev.ignore_device) {
-                                       info("device event will be ignored");
-                                       goto cleanup;
-                               }
-                               if (udev.name[0] == '\0') {
-                                       info("device node creation supressed");
-                                       goto cleanup;
-                               }
-                               
-                               /* create node, store in db */
-                               retval = udev_add_device(&udev, class_dev);
-                       } else {
-                               dbg("no dev-file found");
-                               udev_rules_get_run(&udev, NULL);
-                               if (udev.ignore_device) {
-                                       info("device event will be ignored");
-                                       goto cleanup;
-                               }
-                       }
-                       sysfs_close_class_device(class_dev);
-               } else if (strcmp(action, "remove") == 0) {
-                       dbg("node remove");
-                       udev_rules_get_run(&udev, NULL);
-                       if (udev.ignore_device) {
-                               dbg("device event will be ignored");
-                               goto cleanup;
-                       }
-
-                       /* get name from db, remove db-entry, delete node */
-                       retval = udev_remove_device(&udev);
-               }
+       udev_rules_init(&rules, 0);
 
-               /* export name of device node or netif */
-               if (udev.devname[0] != '\0')
-                       setenv("DEVNAME", udev.devname, 1);
-       } else if (udev.type == DEV_DEVICE) {
-               if (strcmp(action, "add") == 0) {
-                       struct sysfs_device *devices_dev;
-
-                       /* wait for sysfs of /sys/devices/ */
-                       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 run;
-                       }
-                       dbg("devices device opened '%s'", path);
-                       wait_for_devices_device(devices_dev, &error);
-                       udev_rules_get_run(&udev, devices_dev);
-                       sysfs_close_device(devices_dev);
-                       if (udev.ignore_device) {
-                               info("device event will be ignored");
-                               goto cleanup;
-                       }
-               }
-       } else {
-               dbg("default handling");
-               udev_rules_get_run(&udev, NULL);
-               if (udev.ignore_device) {
-                       info("device event will be ignored");
-                       goto cleanup;
-               }
-       }
+       retval = udev_process_event(&rules, &udev);
 
-run:
-       if (udev_run && !list_empty(&udev.run_list)) {
+       if (!retval && udev_run && !list_empty(&udev.run_list)) {
                struct name_entry *name_loop;
 
                dbg("executing run list");
-               list_for_each_entry(name_loop, &udev.run_list, node)
-                       execute_command(name_loop->name, udev.subsystem);
+               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);
+               }
        }
 
-cleanup:
        udev_cleanup_device(&udev);
 
 exit: