X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-util-private.c;h=042b711928add19cff5ab34145d9f519e280e89e;hb=b0de6a63270998662cc069cc2ca1579776bb28df;hp=b33ee79d6b4f110d7caae3f44955886322f6f360;hpb=72c0373f795a5c326e6bd0f7469601f492124d70;p=elogind.git

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index b33ee79d6..042b71192 100644
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -30,7 +30,7 @@ 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, '/');
@@ -50,15 +50,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,6 +64,9 @@ int util_delete_path(struct udev *udev, const char *path)
 	char *pos;
 	int retval;
 
+	if (path[0] == '/')
+		while(path[1] == '/')
+			path++;
 	util_strscpy(p, sizeof(p), path);
 	pos = strrchr(p, '/');
 	if (pos == p || pos == NULL)