X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Ftest-udev.c;h=6ec91c174a20202f86d8471c04f18bbf06b139fd;hp=591e93058a00a2ab5348de7663735e065a5bf8b6;hb=619b97ff2b9e29c79dedd9aff425c7a11764c300;hpb=01618658fd82dbc5e6315b639f00e87c6fee3c54 diff --git a/udev/test-udev.c b/udev/test-udev.c index 591e93058..6ec91c174 100644 --- a/udev/test-udev.c +++ b/udev/test-udev.c @@ -1,24 +1,21 @@ /* * Copyright (C) 2003-2004 Greg Kroah-Hartman - * Copyright (C) 2004-2006 Kay Sievers + * Copyright (C) 2004-2008 Kay Sievers * - * 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 - * Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * 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 Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "config.h" - #include #include #include @@ -29,77 +26,43 @@ #include #include #include +#include #include "udev.h" -#include "udev_rules.h" -#include "udev_selinux.h" -#ifdef USE_LOG -void log_message(int priority, const char *format, ...) -{ - va_list args; - - if (priority > udev_log_priority) - return; - - va_start(args, format); - vsyslog(priority, format, args); - va_end(args); -} -#endif - -static void asmlinkage sig_handler(int signum) +static void sig_handler(int signum) { switch (signum) { case SIGALRM: - exit(1); + _exit(1); case SIGINT: case SIGTERM: - exit(20 + signum); + _exit(20 + signum); } } -int main(int argc, char *argv[], char *envp[]) +int main(int argc, char *argv[]) { - struct sysfs_device *dev; - struct udevice *udev; - const char *maj, *min; - struct udev_rules rules; - const char *action; + struct udev *udev; + struct udev_event *event; + struct udev_device *dev; + struct udev_rules *rules; + char syspath[UTIL_PATH_SIZE]; const char *devpath; + const char *action; const char *subsystem; struct sigaction act; - int devnull; - int retval = -EINVAL; - - if (argc == 2 && strcmp(argv[1], "-V") == 0) { - printf("%s\n", VERSION); - exit(0); - } + int err = -EINVAL; - /* set std fd's to /dev/null, /sbin/hotplug forks us, we don't have them at all */ - devnull = open("/dev/null", O_RDWR); - if (devnull >= 0) { - if (devnull != STDIN_FILENO) - dup2(devnull, STDIN_FILENO); - if (devnull != STDOUT_FILENO) - dup2(devnull, STDOUT_FILENO); - if (devnull != STDERR_FILENO) - dup2(devnull, STDERR_FILENO); - if (devnull > STDERR_FILENO) - close(devnull); - } - - logging_init("udev"); - if (devnull < 0) - err("open /dev/null failed: %s\n", strerror(errno)); - udev_config_init(); - selinux_init(); - dbg("version %s\n", VERSION); + udev = udev_new(); + if (udev == NULL) + exit(1); + info(udev, "version %s\n", VERSION); + udev_selinux_init(udev); /* set signal handlers */ memset(&act, 0x00, sizeof(act)); - act.sa_handler = (void (*)(int)) sig_handler; + act.sa_handler = sig_handler; sigemptyset (&act.sa_mask); act.sa_flags = 0; sigaction(SIGALRM, &act, NULL); @@ -112,66 +75,45 @@ int main(int argc, char *argv[], char *envp[]) action = getenv("ACTION"); devpath = getenv("DEVPATH"); subsystem = getenv("SUBSYSTEM"); - /* older kernels passed the SUBSYSTEM only as argument */ - if (subsystem == NULL && argc == 2) - subsystem = argv[1]; if (action == NULL || subsystem == NULL || devpath == NULL) { - err("action, subsystem or devpath missing\n"); + err(udev, "action, subsystem or devpath missing\n"); goto exit; } - /* export log_priority , as called programs may want to do the same as udev */ - if (udev_log_priority) { - char priority[32]; - - sprintf(priority, "%i", udev_log_priority); - setenv("UDEV_LOG", priority, 1); - } - - sysfs_init(); - udev_rules_init(&rules, 0); + rules = udev_rules_new(udev, 1); - dev = sysfs_device_get(devpath); + util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath)); + util_strlcat(syspath, devpath, sizeof(syspath)); + dev = udev_device_new_from_syspath(udev, syspath); if (dev == NULL) { - info("unable to open '%s'\n", devpath); + info(udev, "unknown device '%s'\n", devpath); goto fail; } - udev = udev_device_init(NULL); - if (udev == NULL) - goto fail; - - /* override built-in sysfs device */ - udev->dev = dev; - strlcpy(udev->action, action, sizeof(udev->action)); + /* skip reading of db, but read kernel parameters */ + udev_device_set_info_loaded(dev); + udev_device_read_uevent_file(dev); - /* get dev_t from environment, which is needed for "remove" to work, "add" works also from sysfs */ - maj = getenv("MAJOR"); - min = getenv("MINOR"); - if (maj != NULL && min != NULL) - udev->devt = makedev(atoi(maj), atoi(min)); - else - udev->devt = udev_device_get_devt(udev); - - retval = udev_device_event(&rules, udev); + udev_device_set_action(dev, action); + event = udev_event_new(dev); + err = udev_event_execute_rules(event, rules); /* rules may change/disable the timeout */ - if (udev->event_timeout >= 0) - alarm(udev->event_timeout); + if (udev_device_get_event_timeout(dev) >= 0) + alarm(udev_device_get_event_timeout(dev)); - if (retval == 0 && !udev->ignore_device && udev_run) - udev_rules_run(udev); + if (err == 0 && !event->ignore_device && udev_get_run(udev)) + udev_event_execute_run(event); - udev_device_cleanup(udev); + udev_event_unref(event); + udev_device_unref(dev); fail: - udev_rules_cleanup(&rules); - sysfs_cleanup(); - selinux_exit(); - + udev_rules_unref(rules); exit: - logging_close(); - if (retval != 0) + udev_selinux_exit(udev); + udev_unref(udev); + if (err != 0) return 1; return 0; }