X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=cac60fd932bfcff1e3b72d2db1e6431fd73fba0e;hb=a9ce6041228c12aad06666904af8dbe3acfd3115;hp=90c34d800a9ca22533f276bf475cd7dc6a450e3a;hpb=2410242aa4d21335026d3b90116078c9146a32f3;p=elogind.git diff --git a/udev.c b/udev.c index 90c34d800..cac60fd93 100644 --- a/udev.c +++ b/udev.c @@ -27,22 +27,24 @@ #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 "logging.h" #include "namedev.h" #include "udevdb.h" +/* timeout flag for udevdb */ +extern sig_atomic_t gotalarm; + /* global variables */ char **main_argv; char **main_envp; -/* local variables */ -static int is_udevstart; - #ifdef LOG unsigned char logname[LOGNAME_SIZE]; void log_message(int level, const char *format, ...) @@ -58,9 +60,13 @@ void log_message(int level, const char *format, ...) } #endif -asmlinkage static void sig_handler(int signum) +static void asmlinkage sig_handler(int signum) { switch (signum) { + case SIGALRM: + gotalarm = 1; + info("error: timeout reached, event probably not handled correctly"); + break; case SIGINT: case SIGTERM: udevdb_exit(); @@ -70,124 +76,132 @@ asmlinkage static void sig_handler(int signum) } } -static char *subsystem_blacklist[] = { - "scsi_host", - "scsi_device", - "usb_host", - "pci_bus", - "pcmcia_socket", - "" -}; - -int __udev_hotplug(char *action, const char *devpath, const char *subsystem) +int main(int argc, char *argv[], char *envp[]) { - int retval = -EINVAL; - int i; struct sigaction act; - const int nofake = 0; + struct sysfs_class_device *class_dev; + struct udevice udev; + char path[SYSFS_PATH_MAX]; + int retval = -EINVAL; + enum { + ADD, + REMOVE, + UDEVSTART, + } act_type; - dbg("looking at '%s'", devpath); + dbg("version %s", UDEV_VERSION); - /* 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; - } + main_argv = argv; + main_envp = envp; - i = 0; - while (subsystem_blacklist[i][0] != '\0') { - if (strcmp(subsystem, subsystem_blacklist[i]) == 0) { - dbg("don't care about '%s' devices", subsystem); + logging_init("udev"); + + udev_init_config(); + + if (strstr(argv[0], "udevstart")) { + act_type = UDEVSTART; + } else { + const char *action = get_action(); + const char *devpath = get_devpath(); + const char *subsystem = get_subsystem(main_argv[1]); + + 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("no action '%s' for us", action); goto exit; } - i++; - } - /* initialize udev database */ - retval = udevdb_init(UDEVDB_DEFAULT); - if (retval != 0) { - dbg("unable to initialize database"); - goto exit; + if (!devpath) { + dbg("no devpath?"); + goto exit; + } + dbg("looking at '%s'", devpath); + + /* 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 (!subsystem) { + dbg("no subsystem"); + goto exit; + } + + udev_set_values(&udev, devpath, subsystem); + + /* skip blacklisted subsystems */ + if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) { + dbg("don't care about '%s' devices", subsystem); + goto exit; + }; + } /* set signal handlers */ - act.sa_handler = sig_handler; + act.sa_handler = (void (*) (int))sig_handler; sigemptyset (&act.sa_mask); - act.sa_flags = SA_RESTART; + /* alarm must not restart syscalls*/ + sigaction(SIGALRM, &act, NULL); sigaction(SIGINT, &act, NULL); sigaction(SIGTERM, &act, NULL); - if (strcmp(action, "add") == 0) { - /* Already done. */ - if (!is_udevstart) - namedev_init(); - retval = udev_add_device(devpath, subsystem, nofake); - goto action_done; - } - - if (strcmp(action, "remove") == 0) { - retval = udev_remove_device(devpath, subsystem); - goto action_done; - } - - dbg("unknown action '%s'", action); - retval = -EINVAL; + /* trigger timout to interrupt blocking syscalls */ + alarm(ALARM_TIMEOUT); -action_done: - udevdb_exit(); + /* initialize udev database */ + if (udevdb_init(UDEVDB_DEFAULT) != 0) + info("error: unable to initialize database, continuing without database"); -exit: - return retval; -} + 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); -static int udev_hotplug(void) -{ - char *action; - char *devpath; - char *subsystem; - - action = get_action(); - if (!action) { - dbg("no action?"); - return -EINVAL; - } + /* init rules */ + namedev_init(); - devpath = get_devpath(); - if (!devpath) { - dbg("no devpath?"); - return -EINVAL; - } + /* name, create node, store in db */ + retval = udev_add_device(&udev, class_dev); - /* skip blacklisted subsystems */ - subsystem = get_subsystem(main_argv[1]); - if (!subsystem) { - dbg("no subsystem?"); - return -EINVAL; - } + /* run scripts */ + dev_d_execute(&udev); - return __udev_hotplug(action, devpath, subsystem); -} + sysfs_close_class_device(class_dev); + break; + case REMOVE: + dbg("udev remove"); -int main(int argc, char *argv[], char *envp[]) -{ - main_argv = argv; - main_envp = envp; + /* get node from db, delete it*/ + retval = udev_remove_device(&udev); - if (strstr(argv[0], "udevstart")) { - /* Setup env variables. */ - setenv("UDEV_NO_SLEEP", "1", 1); - is_udevstart = 1; + /* run scripts */ + dev_d_execute(&udev); } - /* initialize our configuration */ - udev_init_config(); - - dbg("version %s", UDEV_VERSION); + udevdb_exit(); - if (is_udevstart) { - namedev_init(); - return udev_start(); - } else - return udev_hotplug(); +exit: + logging_close(); + return retval; }