X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevtest.c;h=8c56dba0f1c7d3cc9e7adb5ed534fff13af244e2;hb=491a6a71ff685373422621f4b67f550806072d17;hp=d17157cbd116d9c045e4a5f87b80f077a14dfb93;hpb=27b77df44daebbd7597c572343105c16de099233;p=elogind.git

diff --git a/udevtest.c b/udevtest.c
index d17157cbd..8c56dba0f 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -26,6 +26,7 @@
 #include <ctype.h>
 #include <signal.h>
 #include <syslog.h>
+#include <getopt.h>
 
 #include "udev.h"
 #include "udev_rules.h"
@@ -49,28 +50,58 @@ void log_message (int priority, const char *format, ...)
 
 int main(int argc, char *argv[], char *envp[])
 {
+	int force = 0;
+	char *action = "add";
 	struct udev_rules rules = {};
 	char *devpath = NULL;
 	struct udevice *udev;
 	struct sysfs_device *dev;
-	int i;
 	int retval;
 	int rc = 0;
 
+	static const struct option options[] = {
+		{ "action", 1, NULL, 'a' },
+		{ "force", 0, NULL, 'f' },
+		{ "help", 0, NULL, 'h' },
+		{}
+	};
+
 	info("version %s", UDEV_VERSION);
 	udev_config_init();
-	if (udev_log_priority < LOG_INFO)
-		udev_log_priority = LOG_INFO;
+	if (udev_log_priority < LOG_INFO) {
+		char priority[32];
 
-	for (i = 1 ; i < argc; i++) {
-		char *arg = argv[i];
+		udev_log_priority = LOG_INFO;
+		sprintf(priority, "%i", udev_log_priority);
+		setenv("UDEV_LOG", priority, 1);
+	}
 
-		if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
-			printf("Usage: udevtest [--help] <devpath>\n");
-			goto exit;
-		} else
-			devpath = arg;
+	while (1) {
+		int option;
+
+		option = getopt_long(argc, argv, "a:fh", options, NULL);
+		if (option == -1)
+			break;
+
+		dbg("option '%c'", option);
+		switch (option) {
+		case 'a':
+			action = optarg;
+			break;
+		case 'f':
+			force = 1;
+			break;
+		case 'h':
+			printf("Usage: udevtest [--action=<string>] [--force] [--help] <devpath>\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:
+			exit(1);
+		}
 	}
+	devpath = argv[optind];
 
 	if (devpath == NULL) {
 		fprintf(stderr, "devpath parameter missing\n");
@@ -92,7 +123,7 @@ int main(int argc, char *argv[], char *envp[])
 		goto exit;
 	}
 
-	udev = udev_device_init();
+	udev = udev_device_init(NULL);
 	if (udev == NULL) {
 		fprintf(stderr, "error initializing device\n");
 		rc = 3;
@@ -101,16 +132,22 @@ int main(int argc, char *argv[], char *envp[])
 
 	/* override built-in sysfs device */
 	udev->dev = dev;
-	strcpy(udev->action, "add");
+	strcpy(udev->action, action);
 	udev->devt = udev_device_get_devt(udev);
 
 	/* simulate node creation with test flag */
-	udev->test_run = 1;
+	if (!force)
+		udev->test_run = 1;
 
 	setenv("DEVPATH", udev->dev->devpath, 1);
 	setenv("SUBSYSTEM", udev->dev->subsystem, 1);
 	setenv("ACTION", "add", 1);
 
+	printf("This program is for debugging only, it does not run any program,\n"
+	       "specified by a RUN key. It may show incorrect results, if rules\n"
+	       "match against subsystem specfic kernel event variables.\n"
+	       "\n");
+
 	info("looking at device '%s' from subsystem '%s'", udev->dev->devpath, udev->dev->subsystem);
 	retval = udev_device_event(&rules, udev);
 	if (retval == 0 && !udev->ignore_device && udev_run) {