X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-test.c;h=9d505146cf851a5c5fd3dab942372ca90e0d2c34;hp=090c524190b8cb34c5355002c189d784fd024839;hb=c807ad918c7c61a8af3fcc930cc2a5ad4c978ea1;hpb=8460299b572eb13e7b97a0956b59c053f9009afa

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 090c52419..9d505146c 100644
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -29,23 +29,20 @@
 #include <getopt.h>
 
 #include "udev.h"
-#include "udev-rules.h"
 
 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 = {};
+	struct udev_rules *rules = NULL;
 	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' },
 		{}
 	};
@@ -64,13 +61,9 @@ 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");
 			exit(0);
 		default:
@@ -90,7 +83,12 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 	       "some values may be different, or not available at a simulation run.\n"
 	       "\n");
 
-	udev_rules_init(udev, &rules, 0);
+	rules = udev_rules_new(udev, 1);
+	if (rules == NULL) {
+		fprintf(stderr, "error reading rules\n");
+		rc = 1;
+		goto exit;
+	}
 
 	/* add /sys if needed */
 	if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
@@ -112,12 +110,7 @@ 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_run(event, &rules);
+	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));
@@ -129,13 +122,13 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 			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, program, sizeof(program));
 			info(udev, "run: '%s'\n", program);
 		}
 	}
 	udev_event_unref(event);
 	udev_device_unref(dev);
 exit:
-	udev_rules_cleanup(&rules);
+	udev_rules_unref(rules);
 	return rc;
 }