X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=17ab635f1ea07dd91eacbf046742d890f907c6e9;hp=a9da014ea664e0b157aad52acff0ab66538a291f;hb=a805ead1046db16902f5f228ed63666d9950c061;hpb=bc0410fdb64e295ae74d990185fa0bbc883e5432 diff --git a/udev.c b/udev.c index a9da014ea..17ab635f1 100644 --- a/udev.c +++ b/udev.c @@ -1,10 +1,8 @@ /* * udev.c * - * Userspace devfs - * - * Copyright (C) 2003,2004 Greg Kroah-Hartman - * Copyright (C) 2004 Kay Sievers + * Copyright (C) 2003-2004 Greg Kroah-Hartman + * Copyright (C) 2004-2005 Kay Sievers * * 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 @@ -30,59 +28,25 @@ #include #include #include +#include -#include "libsysfs/sysfs/libsysfs.h" #include "udev.h" -#include "udev_utils.h" -#include "udev_sysfs.h" -#include "udev_version.h" -#include "namedev.h" -#include "logging.h" - +#include "udev_rules.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 -/* (for now) true if udevsend is the helper */ -static int manage_hotplug_event(void) { - char helper[256]; - int fd; - int len; - - /* false, if we are called directly */ - if (!getenv("MANAGED_EVENT")) - goto exit; - - fd = open("/proc/sys/kernel/hotplug", O_RDONLY); - if (fd < 0) - goto exit; - - len = read(fd, helper, 256); - close(fd); - - if (len < 0) - goto exit; - helper[len] = '\0'; - - if (strstr(helper, "udevsend")) - return 1; - -exit: - return 0; -} - static void asmlinkage sig_handler(int signum) { switch (signum) { @@ -96,15 +60,15 @@ 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]; - 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) { @@ -112,13 +76,28 @@ 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"); + if (devnull < 0) + err("fatal, could not open /dev/null: %s", strerror(errno)); + udev_config_init(); dbg("version %s", UDEV_VERSION); - udev_init_config(); - /* 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; sigaction(SIGALRM, &act, NULL); @@ -126,122 +105,80 @@ int main(int argc, char *argv[], char *envp[]) sigaction(SIGTERM, &act, NULL); /* trigger timeout to prevent hanging processes */ - alarm(ALARM_TIMEOUT); - - if (strstr(argv[0], "udevstart") || (argc == 2 && 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(); - goto exit; - } + 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]; - udev_init_device(&udev, devpath, subsystem); - if (!action) { - dbg("no action"); - goto hotplug; + if (action == NULL || subsystem == NULL || devpath == NULL) { + err("action, subsystem or devpath missing"); + goto exit; } - if (!subsystem) { - dbg("no subsystem"); - goto hotplug; - } + /* export log_priority , as called programs may want to do the same as udev */ + if (udev_log_priority) { + char priority[32]; - if (!devpath) { - dbg("no devpath"); - goto hotplug; + sprintf(priority, "%i", udev_log_priority); + setenv("UDEV_LOG", priority, 1); } - /* export logging flag, as 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 (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 != 'n' && subsystem_expect_no_dev(udev.subsystem)) { - dbg("don't care about '%s' devices", udev.subsystem); - goto hotplug; - } - - snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath); - 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); - - /* init rules, permissions */ - namedev_init(); + sysfs_init(); + udev_rules_init(&rules, 0); - /* 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"); + dev = sysfs_device_get(devpath); + if (dev == NULL) { + info("unable to open '%s'", devpath); + goto fail; + } - /* skip subsystems without "dev" */ - if (subsystem_expect_no_dev(udev.subsystem)) { - dbg("don't care about '%s' devices", udev.subsystem); - goto hotplug; + 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) { + 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)); } - - /* get node from db, remove db-entry, delete created node */ - retval = udev_remove_device(&udev); } - - /* run dev.d/ scripts if we created/deleted a node or changed a netif name */ - if (udev.devname[0] != '\0') { - setenv("DEVNAME", udev.devname, 1); - if (udev_dev_d) - udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX); - } - } 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 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"); - } - } else { - dbg("unhandled"); } -hotplug: - if (udev_hotplug_d && manage_hotplug_event()) - udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX); + udev_device_cleanup(udev); +fail: + udev_rules_cleanup(&rules); + sysfs_cleanup(); exit: logging_close(); - return retval; + if (retval != 0) + return 1; + return 0; }