X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-test.c;h=a7c6226a567d1c95bc7315f631329133e3872763;hp=70da9ebf676b433679b303deb6071b9e55acc42f;hb=aa29418a13dc1e1eedca702663e733cc8d9f9859;hpb=aa8734ffcb8a895fc8d66ff383cbcf8f4b78f562 diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c index 70da9ebf6..a7c6226a5 100644 --- a/udev/udevadm-test.c +++ b/udev/udevadm-test.c @@ -27,35 +27,37 @@ #include #include #include +#include #include "udev.h" -#include "udev_rules.h" -int udevadm_test(struct udev *udev, int argc, char *argv[]) +static int adm_test(struct udev *udev, int argc, char *argv[]) { + int resolve_names = 1; char filename[UTIL_PATH_SIZE]; - int force = 0; const char *action = "add"; const char *syspath = NULL; - struct udev_event *event; - struct udev_device *dev; - struct udev_rules rules = {}; + struct udev_event *event = NULL; + struct udev_device *dev = NULL; + struct udev_rules *rules = NULL; + struct udev_list_entry *entry; + sigset_t mask, sigmask_orig; int err; int rc = 0; static const struct option options[] = { { "action", required_argument, NULL, 'a' }, - { "force", no_argument, NULL, 'f' }, + { "resolve-names", required_argument, NULL, 'N' }, { "help", no_argument, NULL, 'h' }, {} }; info(udev, "version %s\n", VERSION); - while (1) { + for (;;) { int option; - option = getopt_long(argc, argv, "a:s:fh", options, NULL); + option = getopt_long(argc, argv, "a:s:N:fh", options, NULL); if (option == -1) break; @@ -64,25 +66,34 @@ int udevadm_test(struct udev *udev, int argc, char *argv[]) case 'a': action = optarg; break; - case 'f': - force = 1; + case 'N': + if (strcmp (optarg, "early") == 0) { + resolve_names = 1; + } else if (strcmp (optarg, "late") == 0) { + resolve_names = 0; + } else if (strcmp (optarg, "never") == 0) { + resolve_names = -1; + } else { + fprintf(stderr, "resolve-names must be early, late or never\n"); + err(udev, "resolve-names must be early, late or never\n"); + exit(EXIT_FAILURE); + } break; case 'h': printf("Usage: udevadm test OPTIONS \n" " --action= set action string\n" - " --force don't skip node/link creation\n" - " --help print this help text\n\n"); - exit(0); + " --help\n\n"); + exit(EXIT_SUCCESS); default: - exit(1); + exit(EXIT_FAILURE); } } syspath = argv[optind]; if (syspath == NULL) { fprintf(stderr, "syspath parameter missing\n"); - rc = 1; - goto exit; + rc = 2; + goto out; } printf("This program is for debugging only, it does not run any program,\n" @@ -90,20 +101,29 @@ int udevadm_test(struct udev *udev, int argc, char *argv[]) "some values may be different, or not available at a simulation run.\n" "\n"); - udev_rules_init(udev, &rules, 0); + sigprocmask(SIG_SETMASK, NULL, &sigmask_orig); - /* add /sys if needed */ - if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) { - util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename)); - util_strlcat(filename, syspath, sizeof(filename)); - syspath = filename; + udev_builtin_load(udev); + + rules = udev_rules_new(udev, resolve_names); + if (rules == NULL) { + fprintf(stderr, "error reading rules\n"); + rc = 3; + goto out; } - dev = udev_device_new_from_syspath(udev, syspath); + /* add /sys if needed */ + if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) + util_strscpyl(filename, sizeof(filename), udev_get_sys_path(udev), syspath, NULL); + else + util_strscpy(filename, sizeof(filename), syspath); + util_remove_trailing_chars(filename, '/'); + + dev = udev_device_new_from_syspath(udev, filename); if (dev == NULL) { - fprintf(stderr, "unable to open device '%s'\n", syspath); - rc = 2; - goto exit; + fprintf(stderr, "unable to open device '%s'\n", filename); + rc = 4; + goto out; } /* skip reading of db, but read kernel parameters */ @@ -113,29 +133,41 @@ int udevadm_test(struct udev *udev, int argc, char *argv[]) udev_device_set_action(dev, action); event = udev_event_new(dev); - /* simulate node creation with test flag */ - if (!force) - event->test = 1; - - err = udev_event_run(event, &rules); + sigfillset(&mask); + sigprocmask(SIG_SETMASK, &mask, &sigmask_orig); + event->fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC); + if (event->fd_signal < 0) { + fprintf(stderr, "error creating signalfd\n"); + rc = 5; + goto out; + } - if (udev_device_get_event_timeout(dev) >= 0) - info(udev, "custom event timeout: %i\n", udev_device_get_event_timeout(dev)); + err = udev_event_execute_rules(event, rules, &sigmask_orig); - if (err == 0 && !event->ignore_device && udev_get_run(udev)) { - struct udev_list_entry *entry; + udev_list_entry_foreach(entry, udev_device_get_properties_list_entry(dev)) + printf("%s=%s\n", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry)); + if (err == 0) { udev_list_entry_foreach(entry, udev_list_get_entry(&event->run_list)) { char program[UTIL_PATH_SIZE]; - util_strlcpy(program, udev_list_entry_get_name(entry), sizeof(program)); - udev_rules_apply_format(event, program, sizeof(program)); - info(udev, "run: '%s'\n", program); + udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program)); + printf("run: '%s'\n", program); } } +out: + if (event != NULL && event->fd_signal >= 0) + close(event->fd_signal); udev_event_unref(event); udev_device_unref(dev); -exit: - udev_rules_cleanup(&rules); + udev_rules_unref(rules); + udev_builtin_unload(udev); return rc; } + +const struct udevadm_cmd udevadm_test = { + .name = "test", + .cmd = adm_test, + .help = "test an event run", + .debug = true, +};