X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=9cc23f0ac70be903fb54edd9e4215d004c3e8870;hp=e67af0df673fb05dd3378afb056f95f79f7dd697;hb=4497fcbf7159975560b680fd8130adcd414d3d67;hpb=c6478ec1e128f0a92c2123ed110a651b88d43569

diff --git a/udevtest.c b/udevtest.c
index e67af0df6..9cc23f0ac 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -29,14 +29,10 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-
-/* global variables */
-char **main_argv;
-char **main_envp;
+#include "logging.h"
 
 
 #ifdef LOG
@@ -59,22 +55,23 @@ int main(int argc, char *argv[], char *envp[])
 	char *devpath;
 	char path[SYSFS_PATH_MAX];
 	char temp[NAME_SIZE];
-	char *subsystem = "";
 	struct udevice udev;
-
-	main_argv = argv;
-	main_envp = envp;
+	char *subsystem = NULL;
 
 	info("version %s", UDEV_VERSION);
 
-	if (argv[1] == NULL) {
-		info("udevinfo expects the DEVPATH of the sysfs device as a argument");
+	if (argc < 2 || argc > 3) {
+		info("Usage: udevtest <devpath> [subsystem]");
 		return 1;
 	}
 
+	/* initialize our configuration */
+	udev_init_config();
+
 	/* remove sysfs_path if given */
-	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
-		devpath = argv[1] + strlen(sysfs_path);
+	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) {
+		devpath = &argv[1][strlen(sysfs_path)] ;
+	}
 	else
 		if (argv[1][0] != '/') {
 			/* prepend '/' if missing */
@@ -93,13 +90,10 @@ int main(int argc, char *argv[], char *envp[])
 		return 2;
 	}
 
-	/* initialize our configuration */
-	udev_init_config();
-
 	/* initialize the naming deamon */
 	namedev_init();
 
-	if (argv[2] != NULL)
+	if (argc == 3)
 		subsystem = argv[2];
 
 	/* fill in values and test_run flag*/