X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-test.c;h=4db70c49ddb68f44c245facaf6d53eb9d1285076;hb=2514465f6a4ab61617482f068e475b945438c1f1;hp=664d72f6d3484e58758c410e33d3713576dcbea8;hpb=f1e7e360465acc7fb038e941c398216cdb569253;p=elogind.git

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 664d72f6d..4db70c49d 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;
 
@@ -49,7 +50,7 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 
 	info(udev, "version %s\n", VERSION);
 
-	while (1) {
+	for (;;) {
 		int option;
 
 		option = getopt_long(argc, argv, "a:s:fh", options, NULL);
@@ -91,15 +92,15 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 	}
 
 	/* 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;
-	}
+	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, syspath);
+	dev = udev_device_new_from_syspath(udev, filename);
 	if (dev == NULL) {
-		fprintf(stderr, "unable to open device '%s'\n", syspath);
+		fprintf(stderr, "unable to open device '%s'\n", filename);
 		rc = 2;
 		goto exit;
 	}
@@ -115,17 +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];
 
-			util_strlcpy(program, udev_list_entry_get_name(entry), sizeof(program));
-			udev_event_apply_format(event, program, sizeof(program));
+			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: