X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=9b4d91f75cea26373c9aebc7688b0d992d0c3089;hp=0d0a5da2074d22d1ab731831021da0570dd72946;hb=60ea6945259ee0336ebd742e701a109c90e5a6ab;hpb=4070d2fea01f3c9ee9b9761b5ec795e2c13b126b diff --git a/udev.c b/udev.c index 0d0a5da20..9b4d91f75 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 @@ -24,133 +23,78 @@ #include #include #include -#include -#include #include #include #include -#include +#include "libsysfs/sysfs/libsysfs.h" #include "udev.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; +#ifdef LOG +unsigned char logname[LOGNAME_SIZE]; +void log_message(int level, const char *format, ...) +{ + va_list args; + + if (!udev_log) + return; + + va_start(args, format); + vsyslog(level, format, args); + va_end(args); +} +#endif + 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) -{ - char *action; - - action = getenv("ACTION"); - return action; -} - -static inline char *get_devpath(void) -{ - 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"); - } - 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 '?': - default: - goto help; - } - } - -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 inline int udev_hotplug(int argc, char **argv) +static char *subsystem_blacklist[] = { + "net", + "scsi_host", + "scsi_device", + "usb_host", + "pci_bus", + "pcmcia_socket", + "" +}; + +static int udev_hotplug(void) { char *action; char *devpath; char *subsystem; int retval = -EINVAL; + int i; + struct sigaction act; - 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); @@ -162,16 +106,19 @@ static inline int udev_hotplug(int argc, char **argv) goto exit; } - /* but we don't care about net class devices */ - if (strcmp(subsystem, "net") == 0) { - dbg("don't care about net devices"); + /* skip blacklisted subsystems */ + subsystem = get_subsystem(main_argv[1]); + if (!subsystem) { + dbg("no subsystem?"); goto exit; } - - action = get_action(); - if (!action) { - dbg ("no action?"); - goto exit; + 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 */ @@ -185,15 +132,17 @@ static inline int udev_hotplug(int argc, char **argv) } /* set up a default signal handler for now */ - signal(SIGINT, sig_handler); - signal(SIGTERM, sig_handler); - signal(SIGKILL, sig_handler); + act.sa_handler = sig_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = SA_RESTART; + sigaction(SIGINT, &act, NULL); + sigaction(SIGTERM, &act, NULL); /* initialize the naming deamon */ namedev_init(); if (strcmp(action, "add") == 0) - retval = udev_add_device(devpath, subsystem); + retval = udev_add_device(devpath, subsystem, 0); else if (strcmp(action, "remove") == 0) retval = udev_remove_device(devpath, subsystem); @@ -209,29 +158,23 @@ exit_sysbus: sysbus_disconnect(); exit: - return retval; + if (retval > 0) + retval = 0; + + 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(); } - -