X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-util-private.c;h=fe8f29b3a89007e20b595a73693644e4b18484ca;hb=32ecabb15d76bd9db8f7d15dcd39807383a93934;hp=84dee559c40cafdb4c345786c8d6d61dee88a4fc;hpb=4851d131d62936c531dc4044ce19a4c4a66ba0a1;p=elogind.git

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 84dee559c..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;
@@ -100,24 +101,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);
-
-	retval = chmod(filename, 0000);
-	if (retval)
-		err(udev, "chmod(%s, 0000) failed: %m\n", filename);
+	int err;
 
-	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)
@@ -162,9 +155,12 @@ gid_t util_lookup_group(struct udev *udev, const char *group)
 	buf = NULL;
 	gid = 0;
 	for (;;) {
-		buf = realloc(buf, buflen);
-		if (!buf)
+		char *newbuf;
+
+		newbuf = realloc(buf, buflen);
+		if (!newbuf)
 			break;
+		buf = newbuf;
 		errno = getgrnam_r(group, &grbuf, buf, buflen, &gr);
 		if (gr != NULL) {
 			gid = gr->gr_gid;