chiark / gitweb /
unify execute_command() and execute_program()
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index 8e6d06f1bd0071a3414db5dac712a7d8b218f951..1c55ec14b8764ec898734cf2fd236deb056206b2 100644 (file)
--- a/udev.c
+++ b/udev.c
 #include <unistd.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "logging.h"
 
-
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
-void log_message(int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
 {
        va_list args;
 
-       if (!udev_log)
+       if (priority > udev_log_priority)
                return;
 
        va_start(args, format);
-       vsyslog(level, format, args);
+       vsyslog(priority, format, args);
        va_end(args);
 }
 #endif
@@ -68,136 +67,159 @@ static void asmlinkage sig_handler(int signum)
 
 int main(int argc, char *argv[], char *envp[])
 {
-       struct sigaction act;
-       struct sysfs_class_device *class_dev;
-       struct sysfs_device *devices_dev;
        struct udevice udev;
-       char path[SYSFS_PATH_MAX];
-       int retval = -EINVAL;
+       char path[PATH_SIZE];
        const char *error;
-       const char *action = getenv("ACTION");
-       const char *devpath = getenv("DEVPATH");
-       const char *subsystem = argv[1];
+       const char *action;
+       const char *devpath;
+       const char *subsystem;
+       struct sigaction act;
+       int retval = -EINVAL;
+
+       if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+               printf("%s\n", UDEV_VERSION);
+               exit(0);
+       }
 
-       dbg("version %s", UDEV_VERSION);
        logging_init("udev");
        udev_init_config();
+       dbg("version %s", UDEV_VERSION);
 
        /* set signal handlers */
-       act.sa_handler = (void (*) (int))sig_handler;
+       memset(&act, 0x00, sizeof(act));
+       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);
        sigaction(SIGTERM, &act, NULL);
 
-       /* trigger timeout to interrupt blocking syscalls */
+       /* trigger timeout to prevent hanging processes */
        alarm(ALARM_TIMEOUT);
 
-       udev_set_values(&udev, devpath, subsystem, action);
+       action = getenv("ACTION");
+       devpath = getenv("DEVPATH");
+       subsystem = getenv("SUBSYSTEM");
+       /* older kernels passed the SUBSYSTEM only as argument */
+       if (!subsystem && argc == 2)
+               subsystem = argv[1];
 
-       if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
-               dbg("udevstart");
-
-               /* disable all logging, as it's much too slow on some facilities */
-               udev_log = 0;
-
-               namedev_init();
-               retval = udev_start();
+       if (!action || !subsystem || !devpath) {
+               err("action, subsystem or devpath missing");
                goto exit;
        }
 
-       if (!action) {
-               dbg("no action");
-               goto exit;
-       }
+       /* export log_priority , as called programs may want to do the same as udev */
+       if (udev_log_priority) {
+               char priority[32];
 
-       if (!subsystem) {
-               dbg("no subsystem");
-               goto exit;
+               sprintf(priority, "%i", udev_log_priority);
+               setenv("UDEV_LOG", priority, 1);
        }
 
-       if (!devpath) {
-               dbg("no devpath");
-               goto exit;
-       }
+       udev_init_device(&udev, devpath, subsystem, action);
+       udev_rules_init();
 
-       /* export logging flag, called scripts may want to do the same as udev */
-       if (udev_log)
-               setenv("UDEV_LOG", "1", 1);
-
-       if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) {
+       if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
+               /* handle device node */
                if (strcmp(action, "add") == 0) {
-                       /* wait for sysfs and possibly add node */
-                       dbg("udev add");
-
-                       /* skip blacklisted subsystems */
-                       if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
-                               dbg("don't care about '%s' devices", udev.subsystem);
-                               goto exit;
-                       };
+                       struct sysfs_class_device *class_dev;
 
-                       snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+                       /* 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 exit;
+                               dbg("open class device failed");
+                               goto run;
                        }
                        dbg("opened class_dev->name='%s'", class_dev->name);
-
                        wait_for_class_device(class_dev, &error);
 
-                       /* init rules, permissions */
-                       namedev_init();
-
-                       /* name, create node, store in db */
-                       retval = udev_add_device(&udev, class_dev);
-
-                       /* run dev.d/ scripts if we created a node or changed a netif name */
-                       if (udev.devname[0] != '\0') {
-                               setenv("DEVNAME", udev.devname, 1);
-                               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+                       /* 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) {
-                       /* possibly remove a node */
-                       dbg("udev remove");
-
-                       /* get node from db, delete it */
-                       retval = udev_remove_device(&udev);
-
-                       /* run dev.d/ scripts if we're not instructed to ignore the event */
-                       if (udev.devname[0] != '\0') {
-                               setenv("DEVNAME", udev.devname, 1);
-                               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+                       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);
                }
-       } else if ((strncmp(devpath, "/devices/", 9) == 0)) {
-               if (strcmp(action, "add") == 0) {
-                       /* wait for sysfs */
-                       dbg("devices add");
-
-                       snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath);
-                       devices_dev = wait_devices_device_open(path);
-                       if (!devices_dev) {
-                               dbg("devices device unavailable (probably remove has beaten us)");
-                               goto exit;
-                       }
-                       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");
+               /* 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("unhandled");
+               dbg("default handling");
+               udev_rules_get_run(&udev, NULL);
+               if (udev.ignore_device) {
+                       info("device event will be ignored");
+                       goto cleanup;
+               }
        }
 
+run:
+       if (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_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
+       }
+
+cleanup:
+       udev_cleanup_device(&udev);
+
 exit:
        logging_close();
        return retval;