X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-util-private.c;h=5b3e337643d13a0c1cdaf38f9bb39a76a18a153f;hp=dfde5a998d3413109239eb93cf77e0bf006eaed2;hb=6834a4429997480b3959c04ac9a74de7f29b3056;hpb=d412a685736e3b3350b555f4d7d8ebfc80aa54c9

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index dfde5a998..5b3e33764 100644
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -43,18 +43,29 @@ int util_create_path(struct udev *udev, const char *path)
 	pos[0] = '\0';
 
 	dbg(udev, "stat '%s'\n", p);
-	if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-		return 0;
+	if (stat(p, &stats) == 0) {
+		if ((stats.st_mode & S_IFMT) == S_IFDIR)
+			return 0;
+		else
+			return -ENOTDIR;
+	}
 
-	if (util_create_path(udev, p) != 0)
-		return -1;
+	err = util_create_path(udev, p);
+	if (err != 0)
+		return err;
 
 	dbg(udev, "mkdir '%s'\n", p);
 	udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
 	err = mkdir(p, 0755);
-	if (err != 0 && errno == EEXIST)
-		if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-			err = 0;
+	if (err != 0) {
+		err = -errno;
+		if (err == -EEXIST && stat(p, &stats) == 0) {
+			if ((stats.st_mode & S_IFMT) == S_IFDIR)
+				err = 0;
+			else
+				err = -ENOTDIR;
+		}
+	}
 	udev_selinux_resetfscreatecon(udev);
 	return err;
 }
@@ -251,7 +262,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 	pid_t pid;
 	char arg[UTIL_PATH_SIZE];
 	char program[UTIL_PATH_SIZE];
-	char *argv[(sizeof(arg) / 2) + 1];
+	char *argv[((sizeof(arg) + 1) / 2) + 1];
 	int devnull;
 	int i;
 	int err = 0;
@@ -269,10 +280,14 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 				/* do not separate quotes */
 				pos++;
 				argv[i] = strsep(&pos, "\'");
-				while (pos != NULL && pos[0] == ' ')
-					pos++;
+				if (pos != NULL)
+					while (pos[0] == ' ')
+						pos++;
 			} else {
 				argv[i] = strsep(&pos, " ");
+				if (pos != NULL)
+					while (pos[0] == ' ')
+						pos++;
 			}
 			dbg(udev, "arg[%i] '%s'\n", i, argv[i]);
 			i++;
@@ -333,7 +348,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 		}
 
 		if (sigmask)
-			sigprocmask(SIG_BLOCK, sigmask, NULL);
+			sigprocmask(SIG_SETMASK, sigmask, NULL);
 
 		execve(argv[0], argv, envp);
 		if (errno == ENOENT || errno == ENOTDIR) {