X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Ftest-libudev.c;h=5ff8663b909e2c87a8bc6025fa2c4aca55b6e6ef;hb=b4155660f2b60006816de5966d2b1859dc57ff6a;hp=db08d4845f31572bc078624c10201465855ca907;hpb=48a9b173e88738ff4eefb3519f1d27711b417c8d;p=elogind.git

diff --git a/libudev/test-libudev.c b/libudev/test-libudev.c
index db08d4845..5ff8663b9 100644
--- 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;
 
@@ -329,11 +329,32 @@ static int test_enumerate(struct udev *udev, const char *subsystem)
 	test_enumerate_print_list(udev_enumerate);
 	udev_enumerate_unref(udev_enumerate);
 
+	printf("enumerate 'net' + duplicated scan + null + zero\n");
+	udev_enumerate = udev_enumerate_new(udev);
+	if (udev_enumerate == NULL)
+		return -1;
+	udev_enumerate_add_match_subsystem(udev_enumerate, "net");
+	udev_enumerate_scan_devices(udev_enumerate);
+	udev_enumerate_scan_devices(udev_enumerate);
+	udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/zero");
+	udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/null");
+	udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/zero");
+	udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/null");
+	udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/zero");
+	udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/null");
+	udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/null");
+	udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/zero");
+	udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/zero");
+	udev_enumerate_scan_devices(udev_enumerate);
+	test_enumerate_print_list(udev_enumerate);
+	udev_enumerate_unref(udev_enumerate);
+
 	printf("enumerate 'block'\n");
 	udev_enumerate = udev_enumerate_new(udev);
 	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);
@@ -402,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;