X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils_run.c;h=76a704c52cb19b93db15fe517f2b3171043708b8;hp=31363588c86386da0302779575b879c38c7474dd;hb=b2885eeecf517e82830f585a69ebc9c2c60cfa5e;hpb=d8a57e7c2624bf19ad2f4f91a6d9149d5228402f

diff --git a/udev_utils_run.c b/udev_utils_run.c
index 31363588c..76a704c52 100644
--- a/udev_utils_run.c
+++ b/udev_utils_run.c
@@ -84,16 +84,18 @@ int run_program(const char *command, const char *subsystem,
 	int devnull;
 	int i;
 
+	/* build argv from comand */
 	strlcpy(arg, command, sizeof(arg));
 	i = 0;
-	if (strchr(arg, ' ')) {
+	if (strchr(arg, ' ') != NULL) {
 		char *pos = arg;
+
 		while (pos != NULL) {
 			if (pos[0] == '\'') {
 				/* don't separate if in apostrophes */
 				pos++;
 				argv[i] = strsep(&pos, "\'");
-				while (pos && pos[0] == ' ')
+				while (pos != NULL && pos[0] == ' ')
 					pos++;
 			} else {
 				argv[i] = strsep(&pos, " ");
@@ -102,13 +104,11 @@ int run_program(const char *command, const char *subsystem,
 			i++;
 		}
 		argv[i] = NULL;
-		info("'%s'", command);
 	} else {
 		argv[0] = arg;
-		argv[1] = (char *) subsystem;
-		argv[2] = NULL;
-		info("'%s' '%s'", arg, argv[1]);
+		argv[1] = NULL;
 	}
+	info("'%s'", command);
 
 	/* prepare pipes from child to parent */
 	if (result || log) {