X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=300e85ceb0aa0737c74f589cc39de53e43ed6f41;hp=b395be2abb15e362457a875ba4620900295c1ba5;hb=af4b05d4917fdfa55eff3d8d53a830464d8162a1;hpb=f130b15645fb41d9dd902b6c96948d344bfe96fa diff --git a/udev.c b/udev.c index b395be2ab..300e85ceb 100644 --- a/udev.c +++ b/udev.c @@ -3,8 +3,7 @@ * * Userspace devfs * - * Copyright (C) 2003 Greg Kroah-Hartman - * + * Copyright (C) 2003,2004 Greg Kroah-Hartman * * 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 @@ -21,336 +20,167 @@ * */ +#include +#include #include #include -#include -#include -#include -#include #include +#include #include -#include +#include +#include "libsysfs/sysfs/libsysfs.h" #include "udev.h" +#include "udev_lib.h" +#include "udev_sysfs.h" #include "udev_version.h" -#include "udev_dbus.h" +#include "logging.h" #include "namedev.h" #include "udevdb.h" -#include "libsysfs/libsysfs.h" -/* global variables */ -char **main_argv; -char **main_envp; -static void sig_handler(int signum) +#ifdef LOG +unsigned char logname[LOGNAME_SIZE]; +void log_message(int level, const char *format, ...) { - dbg("caught signal %d", signum); - switch (signum) { - case SIGINT: - case SIGTERM: - case SIGKILL: - sysbus_disconnect(); - udevdb_exit(); - exit(20 + signum); - break; - default: - dbg("unhandled signal"); - } -} - -static inline char *get_action(void) -{ - char *action; - - action = getenv("ACTION"); - return action; -} + va_list args; -static inline char *get_devpath(void) -{ - char *devpath; - - devpath = getenv("DEVPATH"); - return devpath; -} - -static inline char *get_seqnum(void) -{ - char *seqnum; + if (!udev_log) + return; - seqnum = getenv("SEQNUM"); - return seqnum; + va_start(args, format); + vsyslog(level, format, args); + va_end(args); } +#endif -static void print_record(char *path, struct udevice *dev) +static void asmlinkage sig_handler(int signum) { - printf("P: %s\n", path); - printf("N: %s\n", dev->name); - printf("S: %s\n", dev->symlink); - printf("O: %s\n", dev->owner); - printf("G: %s\n", dev->group); - printf("\n"); + switch (signum) { + case SIGALRM: + exit(1); + case SIGINT: + case SIGTERM: + exit(20 + signum); + } } -enum query_type { - NONE, - NAME, - SYMLINK, - OWNER, - GROUP -}; - -static inline int udev_user(int argc, char **argv) +int main(int argc, char *argv[], char *envp[]) { - static const char short_options[] = "dp:q:rVh"; - int option; + struct sigaction act; + struct sysfs_class_device *class_dev; + struct udevice udev; + char path[SYSFS_PATH_MAX]; int retval = -EINVAL; - struct udevice dev; - int root = 0; - enum query_type query = NONE; - char result[NAME_SIZE] = ""; - char path[NAME_SIZE] = ""; - - /* get command line options */ - while (1) { - option = getopt(argc, argv, short_options); - if (option == -1) - break; - - dbg("option '%c'", option); - switch (option) { - case 'p': - dbg("udev path: %s\n", optarg); - strfieldcpy(path, optarg); - break; - - case 'q': - dbg("udev query: %s\n", optarg); + enum { + ADD, + REMOVE, + UDEVSTART, + } act_type; - if (strcmp(optarg, "name") == 0) { - query = NAME; - break; - } - - if (strcmp(optarg, "symlink") == 0) { - query = SYMLINK; - break; - } - - if (strcmp(optarg, "owner") == 0) { - query = OWNER; - break; - } - - if (strcmp(optarg, "group") == 0) { - query = GROUP; - break; - } - - printf("unknown query type\n"); - return -EINVAL; - - case 'r': - root = 1; - break; - - case 'd': - retval = udevdb_open_ro(); - if (retval != 0) { - printf("unable to open udev database\n"); - return -EACCES; - } - retval = udevdb_dump(print_record); - udevdb_exit(); - return retval; + dbg("version %s", UDEV_VERSION); + logging_init("udev"); + udev_init_config(); - case 'V': - printf("udev, version %s\n", UDEV_VERSION); - return 0; + 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]; - case 'h': - retval = 0; - case '?': - default: - goto help; + if (!action) { + dbg("no action?"); + goto exit; } - } - - /* process options */ - if (query != NONE) { - if (path[0] == '\0') { - printf("query needs device path specified\n"); - return -EINVAL; + 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; } - retval = udevdb_open_ro(); - if (retval != 0) { - printf("unable to open udev database\n"); - return -EACCES; + if (!devpath) { + dbg("no devpath?"); + goto exit; } - retval = udevdb_get_dev(path, &dev); - if (retval == 0) { - switch(query) { - case NAME: - if (root) - strfieldcpy(result, udev_root); - strncat(result, dev.name, sizeof(result)); - break; - - case SYMLINK: - strfieldcpy(result, dev.symlink); - break; + dbg("looking at '%s'", devpath); - case GROUP: - strfieldcpy(result, dev.group); - break; - - case OWNER: - strfieldcpy(result, dev.owner); - break; - - default: - break; - } - printf("%s\n", result); - } else { - printf("device not found in udev database\n"); + /* 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; } - udevdb_exit(); - return retval; - } - if (root) { - printf("%s\n", udev_root); - return 0; - } - -help: - printf("Usage: [-pqrdVh]\n" - " -q TYPE query database for the specified value:\n" - " 'name' name of device node\n" - " 'symlink' pointing to node\n" - " 'owner' of node\n" - " 'group' of node\n" - " -p PATH sysfs device path used for query\n" - " -r print udev root\n" - " -d dump whole database\n" - " -V print udev version\n" - " -h print this help text\n" - "\n"); - return retval; -} - -static char *subsystem_blacklist[] = { - "net", - "scsi_host", - "scsi_device", - "usb_host", - "pci_bus", - "", -}; - -static inline int udev_hotplug(int argc, char **argv) -{ - char *action; - char *devpath; - char *subsystem; - int retval = -EINVAL; - int i; - - subsystem = argv[1]; - - devpath = get_devpath(); - if (!devpath) { - dbg ("no devpath?"); - goto exit; - } - dbg("looking at '%s'", devpath); + if (!subsystem) { + dbg("no subsystem"); + goto exit; + } - /* 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; - } + udev_set_values(&udev, devpath, subsystem, action); - /* skip blacklisted subsystems */ - i = 0; - while (subsystem_blacklist[i][0] != '\0') { - if (strcmp(subsystem, subsystem_blacklist[i]) == 0) { + /* skip blacklisted subsystems */ + if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) { dbg("don't care about '%s' devices", subsystem); goto exit; - } - i++; - } + }; - action = get_action(); - if (!action) { - dbg ("no action?"); - goto exit; } - /* connect to the system message bus */ - sysbus_connect(); + /* set signal handlers */ + 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"); + 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"); + break; + } + dbg("opened class_dev->name='%s'", class_dev->name); - /* initialize udev database */ - retval = udevdb_init(UDEVDB_DEFAULT); - if (retval != 0) { - dbg("unable to initialize database"); - goto exit_sysbus; - } + /* init rules */ + namedev_init(); - /* set up a default signal handler for now */ - signal(SIGINT, sig_handler); - signal(SIGTERM, sig_handler); - signal(SIGKILL, sig_handler); + /* name, create node, store in db */ + retval = udev_add_device(&udev, class_dev); - /* initialize the naming deamon */ - namedev_init(); + /* run scripts */ + dev_d_execute(&udev); - if (strcmp(action, "add") == 0) - retval = udev_add_device(devpath, subsystem); + sysfs_close_class_device(class_dev); + break; + case REMOVE: + dbg("udev remove"); - else if (strcmp(action, "remove") == 0) - retval = udev_remove_device(devpath, subsystem); + /* get node from db, delete it*/ + retval = udev_remove_device(&udev); - else { - dbg("unknown action '%s'", action); - retval = -EINVAL; + /* run scripts */ + dev_d_execute(&udev); } - udevdb_exit(); - -exit_sysbus: - /* disconnect from the system message bus */ - sysbus_disconnect(); exit: - if (retval > 0) - retval = 0; - - return -retval; -} - -int main(int argc, char **argv, char **envp) -{ - int retval; - main_argv = argv; - main_envp = envp; - - dbg("version %s", UDEV_VERSION); - - /* initialize our configuration */ - udev_init_config(); - - if (argc == 2 && argv[1][0] != '-') { - dbg("called by hotplug"); - retval = udev_hotplug(argc, argv); - } else { - dbg("called by user"); - retval = udev_user(argc, argv); - } - + logging_close(); return retval; } - -