X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=eb21f7546104b0b287afdaaffe7857205a749665;hb=16ddbbe10a6484daf63596818a19890225388a71;hp=1222b239efe1787f02e2690a5f520fb87d5e0b67;hpb=8eb38ef882192445bd0e012351a6192a2968a76c;p=elogind.git diff --git a/udev.c b/udev.c index 1222b239e..eb21f7546 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,144 +20,81 @@ * */ +#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) +#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"); - } -} + va_list args; -static inline char *get_action(void) -{ - char *action; + if (!udev_log) + return; - action = getenv("ACTION"); - return action; + va_start(args, format); + vsyslog(level, format, args); + va_end(args); } +#endif -static inline char *get_devpath(void) +__attribute__((regparm(0))) static void sig_handler(int signum) { - char *devpath; - - devpath = getenv("DEVPATH"); - return devpath; -} - -static inline char *get_seqnum(void) -{ - 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) +static int udev_hotplug(void) { char *action; char *devpath; char *subsystem; int retval = -EINVAL; int i; + struct sigaction act; + const int nofake = 0; - subsystem = argv[1]; + action = get_action(); + if (!action) { + dbg("no action?"); + goto exit; + } devpath = get_devpath(); if (!devpath) { - dbg ("no devpath?"); + dbg("no devpath?"); goto exit; } dbg("looking at '%s'", devpath); @@ -171,6 +107,11 @@ static inline int udev_hotplug(int argc, char **argv) } /* skip blacklisted subsystems */ + subsystem = get_subsystem(main_argv[1]); + if (!subsystem) { + dbg("no subsystem?"); + goto exit; + } i = 0; while (subsystem_blacklist[i][0] != '\0') { if (strcmp(subsystem, subsystem_blacklist[i]) == 0) { @@ -180,70 +121,52 @@ static inline int udev_hotplug(int argc, char **argv) i++; } - action = get_action(); - if (!action) { - dbg ("no action?"); - goto exit; - } - - /* connect to the system message bus */ - sysbus_connect(); - /* initialize udev database */ retval = udevdb_init(UDEVDB_DEFAULT); if (retval != 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); + /* 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); + + if (strcmp(action, "add") == 0) { + namedev_init(); + retval = udev_add_device(devpath, subsystem, nofake); + goto action_done; + } - else if (strcmp(action, "remove") == 0) + if (strcmp(action, "remove") == 0) { retval = udev_remove_device(devpath, subsystem); - - else { - dbg("unknown action '%s'", action); - retval = -EINVAL; + goto action_done; } - udevdb_exit(); -exit_sysbus: - /* disconnect from the system message bus */ - sysbus_disconnect(); + dbg("unknown action '%s'", action); + retval = -EINVAL; + +action_done: + udevdb_exit(); exit: return retval; } -int main(int argc, char **argv, char **envp) +int main(int argc, char *argv[], char *envp[]) { main_argv = argv; main_envp = envp; - int retval; - dbg("version %s", UDEV_VERSION); + init_logging("udev"); /* 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); - } + dbg("version %s", UDEV_VERSION); - return retval; + return udev_hotplug(); } - -