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

diff --git a/udevtest.c b/udevtest.c
index 9868c9bcd..418d43de1 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -44,8 +44,7 @@ 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
 
@@ -92,15 +91,17 @@ int main(int argc, char *argv[], char *envp[])
 {
 	int force = 0;
 	char *action = "add";
-	struct udev_rules rules = {};
+	char *subsystem = NULL;
 	char *devpath = NULL;
 	struct udevice *udev;
 	struct sysfs_device *dev;
+	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' },
 		{}
@@ -119,7 +120,7 @@ int main(int argc, char *argv[], char *envp[])
 	while (1) {
 		int option;
 
-		option = getopt_long(argc, argv, "a:fh", options, NULL);
+		option = getopt_long(argc, argv, "a:s:fh", options, NULL);
 		if (option == -1)
 			break;
 
@@ -128,14 +129,18 @@ int main(int argc, char *argv[], char *envp[])
 		case 'a':
 			action = optarg;
 			break;
+		case 's':
+			subsystem = 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");
+			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);
@@ -149,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);
 
@@ -170,9 +180,12 @@ int main(int argc, char *argv[], char *envp[])
 		goto exit;
 	}
 
+	if (subsystem != NULL)
+		strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
+
 	/* override built-in sysfs device */
 	udev->dev = dev;
-	strcpy(udev->action, action);
+	strlcpy(udev->action, action, sizeof(udev->action));
 	udev->devt = udev_device_get_devt(udev);
 
 	/* simulate node creation with test flag */
@@ -184,11 +197,6 @@ int main(int argc, char *argv[], char *envp[])
 	setenv("ACTION", udev->action, 1);
 	import_uevent_var(udev->dev->devpath);
 
-	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");
-
 	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) {
@@ -202,6 +210,7 @@ int main(int argc, char *argv[], char *envp[])
 			info("run: '%s'", program);
 		}
 	}
+	udev_device_cleanup(udev);
 
 exit:
 	udev_rules_cleanup(&rules);