X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=926c4b526ab5a82dd0107af833f5cfaf8569e98b;hp=8d5be0542e8d3edff7fabc74f388eaeecb01ade2;hb=b4f192f054410bf9ddd04b770f0b46f0fd25abce;hpb=7a947ce51586fd4212447643df90580542777ab9 diff --git a/udev.c b/udev.c index 8d5be0542..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 @@ -20,41 +19,36 @@ * */ -#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T #include #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 "udev_rules.h" #include "logging.h" -#include "namedev.h" -#include "udevdb.h" - -/* timeout flag for udevdb */ -extern sig_atomic_t gotalarm; - -/* global variables */ -char **main_argv; -char **main_envp; -#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 @@ -63,160 +57,99 @@ static void asmlinkage sig_handler(int signum) { switch (signum) { case SIGALRM: - gotalarm = 1; - info("error: timeout reached, event probably not handled correctly"); - break; + exit(1); case SIGINT: case SIGTERM: - udevdb_exit(); exit(20 + signum); - default: - dbg("unhandled signal %d", signum); } } -/* list of subsystems we don't care about. not listing such systems here - * is not critical, but it makes it faster as we don't look for the "dev" file - */ -static int subsystem_without_dev(const char *subsystem) -{ - char *subsystem_blacklist[] = { - "scsi_host", - "scsi_device", - "usb_host", - "pci_bus", - "pcmcia_socket", - "bluetooth", - "i2c-adapter", - "pci_bus", - "ieee1394", - "ieee1394_host", - "ieee1394_node", - NULL - }; - char **subsys; - - for (subsys = subsystem_blacklist; *subsys != NULL; subsys++) { - if (strcmp(subsystem, *subsys) == 0) - return 1; - } - - return 0; -} - 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); + if (argc == 2 && strcmp(argv[1], "-V") == 0) { + printf("%s\n", UDEV_VERSION); + exit(0); + } - main_argv = argv; - main_envp = envp; + /* 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); - if (strstr(argv[0], "udevstart")) { - act_type = UDEVSTART; - } else { - const char *action = get_action(); - const char *devpath = get_devpath(); - const char *subsystem = get_subsystem(main_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; - } + /* set signal handlers */ + memset(&act, 0x00, sizeof(act)); + act.sa_handler = (void (*)(int)) sig_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = 0; + sigaction(SIGALRM, &act, NULL); + sigaction(SIGINT, &act, NULL); + sigaction(SIGTERM, &act, NULL); - if (!devpath) { - dbg("no devpath?"); - goto exit; - } - dbg("looking at '%s'", udev.devpath); + /* trigger timeout to prevent hanging processes */ + alarm(UDEV_ALARM_TIMEOUT); - /* 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; - } + 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 (!subsystem) { - dbg("no subsystem"); - goto exit; - } + if (!action || !subsystem || !devpath) { + err("action, subsystem or devpath missing"); + goto exit; + } - /* skip blacklisted subsystems */ - if (subsystem_without_dev(subsystem)) { - dbg("don't care about '%s' devices", subsystem); - goto exit; - }; + /* export log_priority , as called programs may want to do the same as udev */ + if (udev_log_priority) { + char priority[32]; - udev_set_values(&udev, devpath, subsystem); + sprintf(priority, "%i", udev_log_priority); + setenv("UDEV_LOG", priority, 1); } - /* set signal handlers */ - act.sa_handler = (void (*) (int))sig_handler; - sigemptyset (&act.sa_mask); - /* alarm must not restart syscalls*/ - sigaction(SIGALRM, &act, NULL); - sigaction(SIGINT, &act, NULL); - sigaction(SIGTERM, &act, NULL); + udev_init_device(&udev, devpath, subsystem, action); + udev_rules_init(&rules, 1, 0); + + retval = udev_process_event(&rules, &udev); + + if (!retval && udev_run && !list_empty(&udev.run_list)) { + struct name_entry *name_loop; - /* trigger timout to interrupt blocking syscalls */ - alarm(ALARM_TIMEOUT); - - /* initialize udev database */ - if (udevdb_init(UDEVDB_DEFAULT) != 0) - info("error: unable to initialize database, continuing without database"); - - switch(act_type) { - case UDEVSTART: - dbg("udevstart"); - namedev_init(); - retval = udev_start(); - break; - case ADD: - dbg("udev add"); - - /* init rules */ - namedev_init(); - - /* 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"); - break; + 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)); } - dbg("opened class_dev->name='%s'", class_dev->name); - - /* name, create node, store in db */ - retval = udev_add_device(&udev, class_dev); - break; - case REMOVE: - dbg("udev remove"); - retval = udev_remove_device(&udev); } - udevdb_exit(); + udev_rules_close(&rules); + udev_cleanup_device(&udev); exit: logging_close();