X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-util-private.c;h=fe8f29b3a89007e20b595a73693644e4b18484ca;hb=4c21b7156d951c99fe8d57a36bf3b006cc3d3a73;hp=00d1c95d52fcd981d2d9a24c15da86cbd75dcd0c;hpb=fc206fbe3e326f5acfc64243f9e04eecad121e27;p=elogind.git

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 00d1c95d5..fe8f29b3a 100644
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -30,15 +30,16 @@ 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);
@@ -50,15 +51,12 @@ int util_create_path(struct udev *udev, const char *path)
 
 	dbg(udev, "mkdir '%s'\n", p);
 	udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
-	ret = mkdir(p, 0755);
-	udev_selinux_resetfscreatecon(udev);
-	if (ret == 0)
-		return 0;
-
-	if (errno == EEXIST)
+	err = mkdir(p, 0755);
+	if (err != 0 && errno == EEXIST)
 		if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-			return 0;
-	return -1;
+			err = 0;
+	udev_selinux_resetfscreatecon(udev);
+	return err;
 }
 
 int util_delete_path(struct udev *udev, const char *path)
@@ -67,7 +65,10 @@ int util_delete_path(struct udev *udev, const char *path)
 	char *pos;
 	int retval;
 
-	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;
@@ -96,28 +97,20 @@ int util_delete_path(struct udev *udev, const char *path)
 }
 
 /* Reset permissions on the device node, before unlinking it to make sure,
- * that permisions of possible hard links will be removed too.
+ * that permissions of possible hard links will be removed too.
  */
 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);
+	chmod(filename, 0000);
+	chown(filename, 0, 0);
+	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 +128,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 +141,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 +152,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);
@@ -342,7 +332,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 		}
 		execve(argv[0], argv, envp);
 		if (errno == ENOENT || errno == ENOTDIR) {
-			/* may be on a filesytem which is not mounted right now */
+			/* may be on a filesystem which is not mounted right now */
 			info(udev, "program '%s' not found\n", argv[0]);
 		} else {
 			/* other problems */