X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=227145982ef54da68d913c3a69d332096cfd1367;hp=56dab1f8323227b7fa7028914d1555a251f18710;hb=27c3403dd810e53f6c9b8dffe34af7798a4b52d3;hpb=e40fec176bcdd0b4e763cf85817a7e5c8e1c6c14 diff --git a/udev.c b/udev.c index 56dab1f83..227145982 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,168 +23,158 @@ #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; -char sysfs_path[SYSFS_PATH_MAX]; -char *udev_config_dir = UDEV_CONFIG_DIR; -char *udev_root = UDEV_ROOT; -char udev_db_filename[PATH_MAX+NAME_MAX]; -char udev_config_permission_filename[PATH_MAX+NAME_MAX]; -char udev_config_filename[PATH_MAX+NAME_MAX]; - - -static inline char *get_action(void) +#ifdef LOG +unsigned char logname[42]; +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) +static void sig_handler(int signum) { - char *seqnum; - - seqnum = getenv("SEQNUM"); - return seqnum; -} - -static void get_dirs(void) -{ - char *temp; - char *udev_db = UDEV_DB; - char *udev_config = UDEV_CONFIG_FILE; - char *udev_permission = UDEV_CONFIG_PERMISSION_FILE; - int retval; - - retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX); - if (retval) - dbg("sysfs_get_mnt_path failed"); - - /* see if we should try to override any of the default values */ - temp = getenv("UDEV_TEST"); - if (temp != NULL) { - /* hm testing is happening, use the specified values, if they are present */ - temp = getenv("SYSFS_PATH"); - if (temp) - strncpy(sysfs_path, temp, sizeof(sysfs_path)); - temp = getenv("UDEV_CONFIG_DIR"); - if (temp) - udev_config_dir = temp; - temp = getenv("UDEV_ROOT"); - if (temp) - udev_root = temp; - temp = getenv("UDEV_DB"); - if (temp) - udev_db = temp; - temp = getenv("UDEV_CONFIG_FILE"); - if (temp) - udev_config = temp; - temp = getenv("UDEV_PERMISSION_FILE"); - if (temp) - udev_permission = temp; + switch (signum) { + case SIGINT: + case SIGTERM: + sysbus_disconnect(); + udevdb_exit(); + exit(20 + signum); + default: + dbg("unhandled signal"); } - dbg("sysfs_path = %s", sysfs_path); - - strncpy(udev_db_filename, udev_config_dir, sizeof(udev_db_filename)); - strncat(udev_db_filename, udev_db, sizeof(udev_db_filename)); - - strncpy(udev_config_filename, udev_config_dir, sizeof(udev_config_filename)); - strncat(udev_config_filename, udev_config, sizeof(udev_config_filename)); - - strncpy(udev_config_permission_filename, udev_config_dir, sizeof(udev_config_permission_filename)); - strncat(udev_config_permission_filename, udev_permission, sizeof(udev_config_permission_filename)); } -int main(int argc, char **argv, char **envp) +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; - - main_argv = argv; - main_envp = envp; - - dbg("version %s", UDEV_VERSION); + int i; + struct sigaction act; - if (argc != 2) { - dbg ("unknown number of arguments"); + action = get_action(); + if (!action) { + dbg("no action?"); goto exit; } - subsystem = argv[1]; - devpath = get_devpath(); if (!devpath) { - dbg ("no devpath?"); + dbg("no devpath?"); goto exit; } - dbg("looking at %s", devpath); + dbg("looking at '%s'", devpath); /* we only care about class devices and block stuff */ if (!strstr(devpath, "class") && !strstr(devpath, "block")) { - dbg("not block or class"); + dbg("not a block or class device"); 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 */ + sysbus_connect(); + /* initialize udev database */ - get_dirs(); retval = udevdb_init(UDEVDB_DEFAULT); if (retval != 0) { - dbg("Unable to initialize database."); - goto exit; + dbg("unable to initialize database"); + goto exit_sysbus; } + /* set up a default signal handler for now */ + 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); else { - dbg("Unknown action: %s", action); + dbg("unknown action '%s'", action); retval = -EINVAL; } udevdb_exit(); -exit: - return retval; +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) +{ + main_argv = argv; + main_envp = envp; + + init_logging("udev"); + + /* initialize our configuration */ + udev_init_config(); + + dbg("version %s", UDEV_VERSION); + + return udev_hotplug(); +}