X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=418d43de14369a999c2423af5d13cad5727accb2;hp=73bf7dd1f8dde459575c11cc55a347cf7141ff49;hb=3bf1efa8ddee3999656b0454734bc6b39fc7c00b;hpb=043c6f6d4a97ab3a4aeea8cca16c1cc754b0e5ee

diff --git a/udevtest.c b/udevtest.c
index 73bf7dd1f..418d43de1 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -24,8 +24,10 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <syslog.h>
+#include <getopt.h>
 
 #include "udev.h"
 #include "udev_rules.h"
@@ -42,21 +44,69 @@ void log_message (int priority, const char *format, ...)
 	va_start(args, format);
 	vprintf(format, args);
 	va_end(args);
-	if (format[strlen(format)-1] != '\n')
-		printf("\n");
+	printf("\n");
 }
 #endif
 
+static int import_uevent_var(const char *devpath)
+{
+	char path[PATH_SIZE];
+	static char value[4096]; /* must stay, used with putenv */
+	ssize_t size;
+	int fd;
+	char *key;
+	char *next;
+	int rc = -1;
+
+	/* read uevent file */
+	strlcpy(path, sysfs_path, sizeof(path));
+	strlcat(path, devpath, sizeof(path));
+	strlcat(path, "/uevent", sizeof(path));
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+		goto out;
+	size = read(fd, value, sizeof(value));
+	close(fd);
+	if (size < 0)
+		goto out;
+	value[size] = '\0';
+
+	/* import keys into environment */
+	key = value;
+	while (key[0] != '\0') {
+		next = strchr(key, '\n');
+		if (next == NULL)
+			goto out;
+		next[0] = '\0';
+		info("import into environment: '%s'", key);
+		putenv(key);
+		key = &next[1];
+	}
+	rc = 0;
+out:
+	return rc;
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
-	struct udev_rules rules = {};
+	int force = 0;
+	char *action = "add";
+	char *subsystem = NULL;
 	char *devpath = NULL;
 	struct udevice *udev;
 	struct sysfs_device *dev;
-	int i;
+	struct udev_rules rules = {};
 	int retval;
 	int rc = 0;
 
+	static const struct option options[] = {
+		{ "action", 1, NULL, 'a' },
+		{ "subsystem", 1, NULL, 's' },
+		{ "force", 0, NULL, 'f' },
+		{ "help", 0, NULL, 'h' },
+		{}
+	};
+
 	info("version %s", UDEV_VERSION);
 	udev_config_init();
 	if (udev_log_priority < LOG_INFO) {
@@ -67,15 +117,36 @@ int main(int argc, char *argv[], char *envp[])
 		setenv("UDEV_LOG", priority, 1);
 	}
 
-	for (i = 1 ; i < argc; i++) {
-		char *arg = argv[i];
-
-		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:s:fh", options, NULL);
+		if (option == -1)
+			break;
+
+		dbg("option '%c'", option);
+		switch (option) {
+		case 'a':
+			action = optarg;
+			break;
+		case 's':
+			subsystem = optarg;
+			break;
+		case 'f':
+			force = 1;
+			break;
+		case 'h':
+			printf("Usage: udevtest OPTIONS <devpath>\n"
+			       "  --action=<string>     set action string\n"
+			       "  --subsystem=<string>  set subsystem 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");
@@ -83,6 +154,11 @@ int main(int argc, char *argv[], char *envp[])
 		goto exit;
 	}
 
+	printf("This program is for debugging only, it does not run any program,\n"
+	       "specified by a RUN key. It may show incorrect results, because\n"
+	       "some values may be different, or not available at a simulation run.\n"
+	       "\n");
+
 	sysfs_init();
 	udev_rules_init(&rules, 0);
 
@@ -97,29 +173,29 @@ 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;
 		goto exit;
 	}
 
+	if (subsystem != NULL)
+		strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
+
 	/* override built-in sysfs device */
 	udev->dev = dev;
-	strcpy(udev->action, "add");
+	strlcpy(udev->action, action, sizeof(udev->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 create any node,\n"
-	       "or run any program specified by a RUN key. It may show incorrect results,\n"
-	       "if rules match against subsystem specfic kernel event variables.\n"
-	       "\n");
+	setenv("ACTION", udev->action, 1);
+	import_uevent_var(udev->dev->devpath);
 
 	info("looking at device '%s' from subsystem '%s'", udev->dev->devpath, udev->dev->subsystem);
 	retval = udev_device_event(&rules, udev);
@@ -134,6 +210,7 @@ int main(int argc, char *argv[], char *envp[])
 			info("run: '%s'", program);
 		}
 	}
+	udev_device_cleanup(udev);
 
 exit:
 	udev_rules_cleanup(&rules);