X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-util-private.c;h=6b68b6a3660edef1edaee98625f3c338e92b2fc2;hb=c54b43e2c233e724f840c4f6a0a81bdd549e40bb;hp=3641b3630f8e4ef1fef56c905937cbb3daf043d7;hpb=214a6c791cbc0c1a190c430eb37056087e661344;p=elogind.git

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 3641b3630..6b68b6a36 100644
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -30,49 +30,61 @@ int util_create_path(struct udev *udev, const char *path)
 	char p[UTIL_PATH_SIZE];
 	char *pos;
 	struct stat stats;
-	int ret;
+	int err;
 
 	util_strscpy(p, sizeof(p), path);
 	pos = strrchr(p, '/');
-	if (pos == p || pos == NULL)
+	if (pos == NULL)
 		return 0;
-
-	while (pos[-1] == '/')
+	while (pos != p && pos[-1] == '/')
 		pos--;
+	if (pos == p)
+		return 0;
 	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);
-	ret = mkdir(p, 0755);
+	err = mkdir(p, 0755);
+	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);
-	if (ret == 0)
-		return 0;
-
-	if (errno == EEXIST)
-		if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-			return 0;
-	return -1;
+	return err;
 }
 
 int util_delete_path(struct udev *udev, const char *path)
 {
 	char p[UTIL_PATH_SIZE];
 	char *pos;
-	int retval;
+	int err = 0;
 
-	strcpy (p, path);
+	if (path[0] == '/')
+		while(path[1] == '/')
+			path++;
+	util_strscpy(p, sizeof(p), path);
 	pos = strrchr(p, '/');
 	if (pos == p || pos == NULL)
 		return 0;
 
-	while (1) {
+	for (;;) {
 		*pos = '\0';
 		pos = strrchr(p, '/');
 
@@ -80,19 +92,14 @@ int util_delete_path(struct udev *udev, const char *path)
 		if ((pos == p) || (pos == NULL))
 			break;
 
-		/* remove if empty */
-		retval = rmdir(p);
-		if (errno == ENOENT)
-			retval = 0;
-		if (retval) {
-			if (errno == ENOTEMPTY)
-				return 0;
-			err(udev, "rmdir(%s) failed: %m\n", p);
+		err = rmdir(p);
+		if (err < 0) {
+			if (errno == ENOENT)
+				err = 0;
 			break;
 		}
-		dbg(udev, "removed '%s'\n", p);
 	}
-	return 0;
+	return err;
 }
 
 /* Reset permissions on the device node, before unlinking it to make sure,
@@ -100,24 +107,16 @@ int util_delete_path(struct udev *udev, const char *path)
  */
 int util_unlink_secure(struct udev *udev, const char *filename)
 {
-	int retval;
-
-	retval = chown(filename, 0, 0);
-	if (retval)
-		err(udev, "chown(%s, 0, 0) failed: %m\n", filename);
+	int err;
 
-	retval = chmod(filename, 0000);
-	if (retval)
-		err(udev, "chmod(%s, 0000) failed: %m\n", filename);
-
-	retval = unlink(filename);
+	chown(filename, 0, 0);
+	chmod(filename, 0000);
+	err = unlink(filename);
 	if (errno == ENOENT)
-		retval = 0;
-
-	if (retval)
+		err = 0;
+	if (err)
 		err(udev, "unlink(%s) failed: %m\n", filename);
-
-	return retval;
+	return err;
 }
 
 uid_t util_lookup_user(struct udev *udev, const char *user)
@@ -135,8 +134,7 @@ uid_t util_lookup_user(struct udev *udev, const char *user)
 	if (endptr[0] == '\0')
 		return uid;
 
-	errno = 0;
-	getpwnam_r(user, &pwbuf, buf, buflen, &pw);
+	errno = getpwnam_r(user, &pwbuf, buf, buflen, &pw);
 	if (pw != NULL)
 		return pw->pw_uid;
 	if (errno == 0 || errno == ENOENT || errno == ESRCH)
@@ -149,7 +147,7 @@ uid_t util_lookup_user(struct udev *udev, const char *user)
 gid_t util_lookup_group(struct udev *udev, const char *group)
 {
 	char *endptr;
-	int buflen;
+	int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
 	char *buf;
 	struct group grbuf;
 	struct group *gr;
@@ -160,28 +158,26 @@ gid_t util_lookup_group(struct udev *udev, const char *group)
 	gid = strtoul(group, &endptr, 10);
 	if (endptr[0] == '\0')
 		return gid;
-
-	buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-	if (buflen < 0)
-		buflen = 1000;
 	buf = NULL;
 	gid = 0;
 	for (;;) {
-		buf = realloc(buf, buflen);
-		if (!buf)
+		char *newbuf;
+
+		newbuf = realloc(buf, buflen);
+		if (!newbuf)
 			break;
-		errno = 0;
-		getgrnam_r(group, &grbuf, buf, buflen, &gr);
-		if (gr != NULL)
+		buf = newbuf;
+		errno = getgrnam_r(group, &grbuf, buf, buflen, &gr);
+		if (gr != NULL) {
 			gid = gr->gr_gid;
-		else if (errno == ERANGE) {
+		} else if (errno == ERANGE) {
 			buflen *= 2;
 			continue;
-		}
-		else if (errno == 0 || errno == ENOENT || errno == ESRCH)
+		} else if (errno == 0 || errno == ENOENT || errno == ESRCH) {
 			err(udev, "specified group '%s' unknown\n", group);
-		else
+		} else {
 			err(udev, "error resolving group '%s': %m\n", group);
+		}
 		break;
 	}
 	free(buf);
@@ -252,7 +248,8 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
 }
 
 int util_run_program(struct udev *udev, const char *command, char **envp,
-		     char *result, size_t ressize, size_t *reslen)
+		     char *result, size_t ressize, size_t *reslen,
+		     const sigset_t *sigmask, bool reset_prio)
 {
 	int status;
 	int outpipe[2] = {-1, -1};
@@ -260,7 +257,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;
@@ -278,10 +275,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++;
@@ -340,6 +341,12 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 			dup2(errpipe[WRITE_END], STDERR_FILENO);
 			close(errpipe[WRITE_END]);
 		}
+
+		if (sigmask)
+			sigprocmask(SIG_SETMASK, sigmask, NULL);
+		if (reset_prio)
+			setpriority(PRIO_PROCESS, 0, 0);
+
 		execve(argv[0], argv, envp);
 		if (errno == ENOENT || errno == ENOTDIR) {
 			/* may be on a filesystem which is not mounted right now */
@@ -442,7 +449,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 			if (errpipe[READ_END] > 0)
 				close(errpipe[READ_END]);
 
-			/* return the childs stdout string */
+			/* return the child's stdout string */
 			if (result) {
 				result[respos] = '\0';
 				dbg(udev, "result='%s'\n", result);