X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-test.c;h=6c5710380ef06be216fc6c544a6b6e75a0f56b2d;hp=342b89d08452c8ab9164f05bc66e307509beaa04;hb=b02140b6bcd080c5fd60306a493447ce7afdad64;hpb=dcdcb8cc06c044a0429a688266799838e914f88d

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 342b89d08..6c5710380 100644
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -33,18 +33,17 @@
 int udevadm_test(struct udev *udev, int argc, char *argv[])
 {
 	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 = NULL;
+	struct udev_list_entry *entry;
 	int err;
 	int rc = 0;
 
 	static const struct option options[] = {
 		{ "action", required_argument, NULL, 'a' },
-		{ "force", no_argument, NULL, 'f' },
 		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
@@ -63,14 +62,10 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 		case 'a':
 			action = optarg;
 			break;
-		case 'f':
-			force = 1;
-			break;
 		case 'h':
 			printf("Usage: udevadm test OPTIONS <syspath>\n"
 			       "  --action=<string>     set action string\n"
-			       "  --force               don't skip node/link creation\n"
-			       "  --help                print this help text\n\n");
+			       "  --help\n\n");
 			exit(0);
 		default:
 			exit(1);
@@ -89,7 +84,7 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 	       "some values may be different, or not available at a simulation run.\n"
 	       "\n");
 
-	rules = udev_rules_new(udev, 0);
+	rules = udev_rules_new(udev, 1);
 	if (rules == NULL) {
 		fprintf(stderr, "error reading rules\n");
 		rc = 1;
@@ -97,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;
 	}
@@ -116,24 +111,19 @@ 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_execute_rules(event, rules);
 
 	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 && !event->ignore_device && udev_get_run(udev)) {
 		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));
+			udev_event_apply_format(event, udev_list_entry_get_name(entry), program, sizeof(program));
 			info(udev, "run: '%s'\n", program);
 		}
 	}