X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-queue-private.c;h=2f1afecb298197b8c48c6b1853c2bc7ace3cbfb1;hp=0427b65a015a06b499541c43424974abf12d0b7d;hb=51f43b53293c4cc64c2a55598491c6cbf27b6bd5;hpb=f86ac6e170eae3f40548627cf5ba1264329d43d3

diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
index 0427b65a0..2f1afecb2 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"
@@ -103,10 +103,10 @@ 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);
 }
 
@@ -158,7 +158,7 @@ static struct queue_devpaths *build_index(struct udev_queue_export *udev_queue_e
 		return NULL;
 	}
 	devpaths = calloc(1, sizeof(struct queue_devpaths) + (range + 1) * sizeof(long));
-	if (index == NULL)
+	if (devpaths == NULL)
 		return NULL;
 	devpaths->devpaths_size = range + 1;
 
@@ -221,7 +221,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 +255,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;
 
@@ -396,27 +396,20 @@ 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_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:
@@ -428,18 +421,6 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
 		break;
 
 	case DEVICE_FINISHED:
-		if (udev_device_get_devpath_old(udev_device) != NULL) {
-			/* "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);
-
-			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;
 	}