use /run/udev/ if possible and fall back to /dev/.udev/

[elogind.git] / libudev / test-libudev.c

diff --git a/libudev/test-libudev.c b/libudev/test-libudev.c
index 34b3de86f1be8fe4d01abefa149a7823d5377ef3..5ff8663b909e2c87a8bc6025fa2c4aca55b6e6ef 100644 (file)
--- a/libudev/test-libudev.c
+++ b/libudev/test-libudev.c
@@ -242,7 +242,7 @@ static int test_monitor(struct udev *udev)
        fd = udev_monitor_get_fd(udev_monitor);
        FD_ZERO(&readfds);
 
-       while (1) {
+       for (;;) {
                struct udev_device *device;
                int fdcount;
 
@@ -354,6 +354,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem)
        if (udev_enumerate == NULL)
                return -1;
        udev_enumerate_add_match_subsystem(udev_enumerate,"block");
+       udev_enumerate_add_match_is_initialized(udev_enumerate);
        udev_enumerate_scan_devices(udev_enumerate);
        test_enumerate_print_list(udev_enumerate);
        udev_enumerate_unref(udev_enumerate);
@@ -422,10 +423,10 @@ int main(int argc, char *argv[])
        udev_set_log_fn(udev, log_fn);
        printf("set log: %p\n", log_fn);
 
-       while (1) {
+       for (;;) {
                int option;
 
-               option = getopt_long(argc, argv, "+dhV", options, NULL);
+               option = getopt_long(argc, argv, "+p:s:dhV", options, NULL);
                if (option == -1)
                        break;