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=a799be062a961aa8829d97133456b5910dacc4ad;hp=e0a8738e0e7bc0b346975ba31fb1996b8b0d1869;hb=f6577968a2f86aade8fff503a53fa52a7245251a;hpb=2ffc9cc1917b1bb6fe86881a94a47dce9aa15168

diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
index e0a8738e0..a799be062 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"
@@ -90,23 +90,24 @@ struct udev_queue_export *udev_queue_export_new(struct udev *udev)
 	return udev_queue_export;
 }
 
-void udev_queue_export_unref(struct udev_queue_export *udev_queue_export)
+struct udev_queue_export *udev_queue_export_unref(struct udev_queue_export *udev_queue_export)
 {
 	if (udev_queue_export == NULL)
-		return;
+		return NULL;
 	if (udev_queue_export->queue_file != NULL)
 		fclose(udev_queue_export->queue_file);
 	free(udev_queue_export);
+	return NULL;
 }
 
 void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export)
 {
 	char filename[UTIL_PATH_SIZE];
 
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue_export->udev), "/.udev/queue.tmp", NULL);
+	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL);
 	unlink(filename);
 
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue_export->udev), "/.udev/queue.bin", NULL);
+	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL);
 	unlink(filename);
 }
 
@@ -221,7 +222,7 @@ static int rebuild_queue_file(struct udev_queue_export *udev_queue_export)
 	}
 
 	/* create new queue file */
-	util_strscpyl(filename_tmp, sizeof(filename_tmp), udev_get_dev_path(udev_queue_export->udev), "/.udev/queue.tmp", NULL);
+	util_strscpyl(filename_tmp, sizeof(filename_tmp), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL);
 	new_queue_file = fopen(filename_tmp, "w+");
 	if (new_queue_file == NULL)
 		goto error;
@@ -255,7 +256,7 @@ static int rebuild_queue_file(struct udev_queue_export *udev_queue_export)
 		goto error;
 
 	/* rename the new file on top of the old one */
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue_export->udev), "/.udev/queue.bin", NULL);
+	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL);
 	if (rename(filename_tmp, filename) != 0)
 		goto error;
 
@@ -401,19 +402,15 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
 		return;
 
 	/* location of failed file */
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/failed/",
+	util_strscpyl(filename, sizeof(filename), udev_get_run_path(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++;
-
-		udev_selinux_setfscreatecon(udev, filename, S_IFLNK);
+		util_create_path(udev, filename);
 		symlink(udev_device_get_devpath(udev_device), filename);
-		udev_selinux_resetfscreatecon(udev);
 		break;
 
 	case DEVICE_QUEUED:
@@ -425,17 +422,6 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
 		break;
 
 	case DEVICE_FINISHED:
-		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];
-
-			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));
-		}
 		break;
 	}