X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-queue-private.c;h=6109837f7ecc44530dcedf81179083fd19d9e919;hp=4dea4ad0e7f4ae8f43e4c0afa3b96dfb06c95ba6;hb=88fbff03df6be4f0f71df11047d4a31daed357e4;hpb=8eefdffb6bb458403c4fa5c9435290189d8d2a60

diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
index 4dea4ad0e..6109837f7 100644
--- a/libudev/libudev-queue-private.c
+++ b/libudev/libudev-queue-private.c
@@ -45,9 +45,9 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <limits.h>
+#include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <assert.h>
 
 #include "libudev.h"
 #include "libudev-private.h"
@@ -396,24 +396,19 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
 {
 	struct udev *udev = udev_device_get_udev(udev_device);
 	char filename[UTIL_PATH_SIZE];
-	char *s;
-	size_t l;
 
 	if (state != DEVICE_FAILED && udev_queue_export->failed_count == 0)
 		return;
 
 	/* location of failed file */
-	s = filename;
-	l = util_strpcpyl(&s, sizeof(filename), udev_get_dev_path(udev_queue_export->udev), "/.udev/failed/", NULL);
-	util_path_encode(udev_device_get_devpath(udev_device), s, l);
+	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/failed/",
+		      udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
 
 	switch (state) {
 	case DEVICE_FAILED:
 		/* record event in the failed directory */
-		if (udev_queue_export->failed_count == 0)
-			util_create_path(udev, filename);
 		udev_queue_export->failed_count++;
-
+		util_create_path(udev, filename);
 		udev_selinux_setfscreatecon(udev, filename, S_IFLNK);
 		symlink(udev_device_get_devpath(udev_device), filename);
 		udev_selinux_resetfscreatecon(udev);
@@ -428,14 +423,13 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
 		break;
 
 	case DEVICE_FINISHED:
-		if (udev_device_get_devpath_old(udev_device) != NULL) {
+		if (udev_device_get_sysname_old(udev_device) != NULL &&
+		    strcmp(udev_device_get_sysname_old(udev_device), udev_device_get_sysname(udev_device)) != 0) {
 			/* "move" event - rename failed file to current name, do not delete failed */
 			char filename_old[UTIL_PATH_SIZE];
 
-			s = filename_old;
-			l = util_strpcpyl(&s, sizeof(filename_old), udev_get_dev_path(udev_queue_export->udev), "/.udev/failed/", NULL);
-			util_path_encode(udev_device_get_devpath_old(udev_device), s, l);
-
+			util_strscpyl(filename_old, sizeof(filename_old), udev_get_dev_path(udev), "/.udev/failed/",
+				      udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname_old(udev_device), NULL);
 			if (rename(filename_old, filename) == 0)
 				info(udev, "renamed devpath, moved failed state of '%s' to %s'\n",
 				     udev_device_get_devpath_old(udev_device), udev_device_get_devpath(udev_device));