chiark / gitweb /
let "ignore_device" always return the event successfully
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index 1c55ec14b8764ec898734cf2fd236deb056206b2..17ab635f1ea07dd91eacbf046742d890f907c6e9 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
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>
+#include <syslog.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "udev_sysfs.h"
-#include "udev_version.h"
 #include "udev_rules.h"
-#include "logging.h"
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
@@ -67,13 +60,15 @@ 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 sysfs_device *dev;
+       struct udevice *udev;
+       const char *maj, *min;
+       struct udev_rules rules;
        const char *action;
        const char *devpath;
        const char *subsystem;
        struct sigaction act;
+       int devnull;
        int retval = -EINVAL;
 
        if (argc == 2 && strcmp(argv[1], "-V") == 0) {
@@ -81,8 +76,23 @@ int main(int argc, char *argv[], char *envp[])
                exit(0);
        }
 
+       /* set std fd's to /dev/null, if the kernel forks us, we don't have them at all */
+       devnull = open("/dev/null", O_RDWR);
+       if (devnull >= 0)  {
+               if (devnull != STDIN_FILENO)
+                       dup2(devnull, STDIN_FILENO);
+               if (devnull != STDOUT_FILENO)
+                       dup2(devnull, STDOUT_FILENO);
+               if (devnull != STDERR_FILENO)
+                       dup2(devnull, STDERR_FILENO);
+               if (devnull > STDERR_FILENO)
+                       close(devnull);
+       }
+
        logging_init("udev");
-       udev_init_config();
+       if (devnull < 0)
+               err("fatal, could not open /dev/null: %s", strerror(errno));
+       udev_config_init();
        dbg("version %s", UDEV_VERSION);
 
        /* set signal handlers */
@@ -95,16 +105,16 @@ 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");
        subsystem = getenv("SUBSYSTEM");
        /* older kernels passed the SUBSYSTEM only as argument */
-       if (!subsystem && argc == 2)
+       if (subsystem == NULL && argc == 2)
                subsystem = argv[1];
 
-       if (!action || !subsystem || !devpath) {
+       if (action == NULL || subsystem == NULL || devpath == NULL) {
                err("action, subsystem or devpath missing");
                goto exit;
        }
@@ -117,110 +127,58 @@ int main(int argc, char *argv[], char *envp[])
                setenv("UDEV_LOG", priority, 1);
        }
 
-       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);
-               }
+       sysfs_init();
+       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 && 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;
-               }
+       dev = sysfs_device_get(devpath);
+       if (dev == NULL) {
+               info("unable to open '%s'", devpath);
+               goto fail;
        }
 
-run:
-       if (udev_run && !list_empty(&udev.run_list)) {
+       udev = udev_device_init();
+       if (udev == NULL)
+               goto fail;
+
+       /* override built-in sysfs device */
+       udev->dev = dev;
+       strlcpy(udev->action, action, sizeof(udev->action));
+
+       /* get dev_t from environment, which is needed for "remove" to work, "add" works also from sysfs */
+       maj = getenv("MAJOR");
+       min = getenv("MINOR");
+       if (maj != NULL && min != NULL)
+               udev->devt = makedev(atoi(maj), atoi(min));
+       else
+               udev->devt = udev_device_get_devt(udev);
+
+       retval = udev_device_event(&rules, udev);
+
+       if (retval == 0 && !udev->ignore_device && udev_run) {
                struct name_entry *name_loop;
 
                dbg("executing run list");
-               list_for_each_entry(name_loop, &udev.run_list, node)
-                       execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
+               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 {
+                               char program[PATH_SIZE];
+
+                               strlcpy(program, name_loop->name, sizeof(program));
+                               udev_rules_apply_format(udev, program, sizeof(program));
+                               run_program(program, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+                       }
+               }
        }
 
-cleanup:
-       udev_cleanup_device(&udev);
+       udev_device_cleanup(udev);
+fail:
+       udev_rules_cleanup(&rules);
+       sysfs_cleanup();
 
 exit:
        logging_close();
-       return retval;
+       if (retval != 0)
+               return 1;
+       return 0;
 }