X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-test.c;h=894620073abe41011093f175ae52ceec42223ebd;hb=d80f8ffd1a182fe7fff9816e8a4efc09e877964b;hp=e49d52c5f1800b41f8e2990d4950d03957371aad;hpb=065db052211d3bf08d9b0f698a79a8798faf11d2;p=elogind.git diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c index e49d52c5f..894620073 100644 --- a/udev/udevadm-test.c +++ b/udev/udevadm-test.c @@ -38,6 +38,7 @@ int udevadm_test(struct udev *udev, int argc, char *argv[]) struct udev_event *event; struct udev_device *dev; struct udev_rules *rules = NULL; + struct udev_list_entry *entry; int err; int rc = 0; @@ -115,16 +116,16 @@ int udevadm_test(struct udev *udev, int argc, char *argv[]) if (udev_device_get_event_timeout(dev) >= 0) info(udev, "custom event timeout: %i\n", udev_device_get_event_timeout(dev)); - 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)) + info(udev, "%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]; udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program)); info(udev, "run: '%s'\n", program); } - } udev_event_unref(event); udev_device_unref(dev); exit: