X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=926c4b526ab5a82dd0107af833f5cfaf8569e98b;hp=605a55bf19a956e69d4258774d8e5fa1e4df07af;hb=2321ba6fd89635f321ec08fa3803aa7e20aa76bf;hpb=a97b06483e3006a7d21e534694e8d67d3b3c694d diff --git a/udev.c b/udev.c index 605a55bf1..926c4b526 100644 --- a/udev.c +++ b/udev.c @@ -1,9 +1,8 @@ /* * udev.c * - * Userspace devfs - * - * Copyright (C) 2003,2004 Greg Kroah-Hartman + * 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 @@ -24,31 +23,32 @@ #include #include #include +#include #include #include #include #include +#include #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 @@ -66,134 +66,91 @@ 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 udevice udev; - char path[SYSFS_PATH_MAX]; + struct udev_rules rules; + const char *action; + const char *devpath; + const char *subsystem; + struct sigaction act; + int devnull; int retval = -EINVAL; - enum { - ADD, - REMOVE, - UDEVSTART, - } act_type; - - dbg("version %s", UDEV_VERSION); - logging_init("udev"); - udev_init_config(); - - /* export logging flag, callouts may want to do the same as udev */ - if (udev_log) - setenv("UDEV_LOG", "1", 1); - - if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) { - act_type = UDEVSTART; - } else { - const char *action = getenv("ACTION"); - const char *devpath = getenv("DEVPATH"); - const char *subsystem = argv[1]; - - if (!action) { - dbg("no action?"); - goto exit; - } - if (strcmp(action, "add") == 0) { - act_type = ADD; - } else if (strcmp(action, "remove") == 0) { - act_type = REMOVE; - } else { - dbg("no action '%s' for us", action); - goto exit; - } - - if (!devpath) { - dbg("no devpath?"); - goto exit; - } - dbg("looking at '%s'", devpath); - - /* we only care about class devices and block stuff */ - if (!strstr(devpath, "class") && !strstr(devpath, "block")) { - dbg("not a block or class device"); - goto exit; - } - - if (!subsystem) { - dbg("no subsystem"); - goto exit; - } - - udev_set_values(&udev, devpath, subsystem, action); - /* skip blacklisted subsystems */ - if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) { - dbg("don't care about '%s' devices", subsystem); - goto exit; - }; + if (argc == 2 && strcmp(argv[1], "-V") == 0) { + printf("%s\n", UDEV_VERSION); + 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"); + 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 timout to interrupt blocking syscalls */ - alarm(ALARM_TIMEOUT); - - switch(act_type) { - case UDEVSTART: - dbg("udevstart"); - - /* disable all logging as it's much too slow on some facilities */ - udev_log = 0; - unsetenv("UDEV_LOG"); - - namedev_init(); - retval = udev_start(); - break; - case ADD: - dbg("udev add"); - - /* open the device */ - snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath); - class_dev = sysfs_open_class_device_path(path); - if (class_dev == NULL) { - dbg ("sysfs_open_class_device_path failed"); - goto exit; - } - dbg("opened class_dev->name='%s'", class_dev->name); + /* trigger timeout to prevent hanging processes */ + alarm(UDEV_ALARM_TIMEOUT); - /* init rules */ - namedev_init(); + action = getenv("ACTION"); + devpath = getenv("DEVPATH"); + subsystem = getenv("SUBSYSTEM"); + /* older kernels passed the SUBSYSTEM only as argument */ + if (!subsystem && argc == 2) + subsystem = argv[1]; - /* name, create node, store in db */ - retval = udev_add_device(&udev, class_dev); + if (!action || !subsystem || !devpath) { + err("action, subsystem or devpath missing"); + goto exit; + } - /* 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); - } + /* export log_priority , as called programs may want to do the same as udev */ + if (udev_log_priority) { + char priority[32]; - sysfs_close_class_device(class_dev); - break; - case REMOVE: - dbg("udev remove"); + sprintf(priority, "%i", udev_log_priority); + setenv("UDEV_LOG", priority, 1); + } + + udev_init_device(&udev, devpath, subsystem, action); + udev_rules_init(&rules, 1, 0); - /* get node from db, delete it*/ - retval = udev_remove_device(&udev); + retval = udev_process_event(&rules, &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); + 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) { + if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0) + pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, action); + else + run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO)); } } + udev_rules_close(&rules); + udev_cleanup_device(&udev); + exit: logging_close(); return retval;