X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=e6f2744fcbefe0826255550a0879e9f2f1c440a3;hp=bbff89bad5165ca1ee50ed98f2c6950d95cf704c;hb=a551c7b0ceb72145a5256cdd53b0b52ff9f766de;hpb=c53735efc9720b28676c1b51fbed04dc592236e8 diff --git a/udev.c b/udev.c index bbff89bad..e6f2744fc 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,229 +20,162 @@ * */ +#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_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) -{ - 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) +#ifdef LOG +unsigned char logname[LOGNAME_SIZE]; +void log_message(int level, const char *format, ...) { - char *action; + va_list args; - action = getenv("ACTION"); - return action; -} + if (!udev_log) + return; -static inline char *get_devpath(void) -{ - char *devpath; - - devpath = getenv("DEVPATH"); - return devpath; + va_start(args, format); + vsyslog(level, format, args); + va_end(args); } +#endif -static inline char *get_seqnum(void) +asmlinkage static void sig_handler(int signum) { - char *seqnum; - - seqnum = getenv("SEQNUM"); - return seqnum; -} - -static inline int udev_user(int argc, char **argv) -{ - static const char short_options[] = "q:rVh"; - int option; - int retval = -EINVAL; - struct udevice dev; - - while (1) { - option = getopt(argc, argv, short_options); - if (option == -1) - break; - - dbg("option '%c'", option); - switch (option) { - case 'q': - dbg("udev query: %s\n", optarg); - retval = udevdb_open_ro(); - if (retval != 0) { - printf("unable to open udev database\n"); - return -1; - } - retval = udevdb_get_dev(optarg, &dev); - if (retval == 0) { - printf("%s\n", dev.name); - } else { - printf("device not found in udev database\n"); - } + switch (signum) { + case SIGINT: + case SIGTERM: udevdb_exit(); - return retval; - - case 'r': - printf("%s\n", udev_root); - return 0; - - case 'V': - printf("udev, version %s\n", UDEV_VERSION); - return 0; - - case 'h': - retval = 0; - case '?': + exit(20 + signum); default: - goto help; - } + dbg("unhandled signal %d", signum); } - -help: - printf("Usage: [-qrVh]\n" - " -q query database for the name of the created node\n" - " -r print udev root\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", + "pcmcia_socket", + "" }; -static inline int udev_hotplug(int argc, char **argv) +int main(int argc, char *argv[], char *envp[]) { + main_argv = argv; + main_envp = envp; + struct sigaction act; char *action; - char *devpath; - char *subsystem; - int retval = -EINVAL; + char *devpath = ""; + char *subsystem = ""; int i; + int retval = -EINVAL; + enum { + ADD, + REMOVE, + UDEVSTART, + } act_type; - subsystem = argv[1]; + dbg("version %s", UDEV_VERSION); - devpath = get_devpath(); - if (!devpath) { - dbg ("no devpath?"); - goto exit; - } - dbg("looking at '%s'", devpath); + /* initialize our configuration */ + udev_init_config(); - /* 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 (strstr(argv[0], "udevstart")) { + act_type = UDEVSTART; + } else { + action = get_action(); + 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("unknown action '%s'", action); + goto exit; + } - /* skip blacklisted subsystems */ - i = 0; - while (subsystem_blacklist[i][0] != '\0') { - if (strcmp(subsystem, subsystem_blacklist[i]) == 0) { - dbg("don't care about '%s' devices", subsystem); + devpath = get_devpath(); + if (!devpath) { + dbg("no devpath?"); goto exit; } - i++; - } + dbg("looking at '%s'", devpath); - action = get_action(); - if (!action) { - dbg ("no action?"); - 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; + } + + subsystem = get_subsystem(main_argv[1]); + if (!subsystem) { + dbg("no subsystem?"); + goto exit; + } + + /* skip blacklisted subsystems */ + i = 0; + while (subsystem_blacklist[i][0] != '\0') { + if (strcmp(subsystem, subsystem_blacklist[i]) == 0) { + dbg("don't care about '%s' devices", subsystem); + goto exit; + } + i++; + } } - /* connect to the system message bus */ - sysbus_connect(); + /* set signal handlers */ + act.sa_handler = sig_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = SA_RESTART; + sigaction(SIGINT, &act, NULL); + sigaction(SIGTERM, &act, NULL); /* initialize udev database */ - retval = udevdb_init(UDEVDB_DEFAULT); - if (retval != 0) { + if (udevdb_init(UDEVDB_DEFAULT) != 0) { dbg("unable to initialize database"); - goto exit_sysbus; + goto exit; } - /* set up a default signal handler for now */ - signal(SIGINT, sig_handler); - signal(SIGTERM, sig_handler); - signal(SIGKILL, sig_handler); - - /* initialize the naming deamon */ - namedev_init(); - - if (strcmp(action, "add") == 0) - retval = udev_add_device(devpath, subsystem); - - else if (strcmp(action, "remove") == 0) + switch(act_type) { + case UDEVSTART: + dbg("udevstart"); + namedev_init(); + udev_sleep = 0; + retval = udev_start(); + break; + case ADD: + dbg("udev add"); + namedev_init(); + retval = udev_add_device(devpath, subsystem, NOFAKE); + break; + case REMOVE: + dbg("udev remove"); retval = udev_remove_device(devpath, subsystem); - - else { - dbg("unknown action '%s'", action); - retval = -EINVAL; } - udevdb_exit(); -exit_sysbus: - /* disconnect from the system message bus */ - sysbus_disconnect(); + udevdb_exit(); exit: - return -retval; -} - -int main(int argc, char **argv, char **envp) -{ - main_argv = argv; - main_envp = envp; - int retval; - - 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); - } - return retval; } - -