X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-queue.c;h=75c5b2425e29fe00ebba1dc99a800ddae8ab69b1;hp=f3cb5ab4986594b4a3e53e93a02508d2858f4160;hb=b466e9ab3951207a3c0c8d2ba6167be1eac1e41a;hpb=0c5c48040ac0f4c97f73fb3ac5493cc2d84a963b

diff --git a/libudev/libudev-queue.c b/libudev/libudev-queue.c
index f3cb5ab49..75c5b2425 100644
--- a/libudev/libudev-queue.c
+++ b/libudev/libudev-queue.c
@@ -28,9 +28,9 @@
  * SECTION:libudev-queue
  * @short_description: access to currently active events
  *
- * The udev daemon processes event asynchronously. All events which do not have
- * interdependencies are run in parallel. This exports the current state of the
- * event processing queue, and the currently event sequence numbers from the kernel
+ * The udev daemon processes events asynchronously. All events which do not have
+ * interdependencies run in parallel. This exports the current state of the
+ * event processing queue, and the current event sequence numbers from the kernel
  * and the udev daemon.
  */
 
@@ -214,7 +214,7 @@ static FILE *open_queue_file(struct udev_queue *udev_queue, unsigned long long i
 	char filename[UTIL_PATH_SIZE];
 	FILE *queue_file;
 
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue->udev), "/.udev/queue.bin", NULL);
+	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue->udev), "/queue.bin", NULL);
 	queue_file = fopen(filename, "re");
 	if (queue_file == NULL)
 		return NULL;
@@ -243,7 +243,7 @@ unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue)
 	if (queue_file == NULL)
 		return 0;
 
-	while (1) {
+	for (;;) {
 		unsigned long long int seqnum;
 		ssize_t devpath_len;
 
@@ -299,7 +299,7 @@ int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
 	if (queue_file == NULL)
 		return 1;
 
-	while (1) {
+	for (;;) {
 		unsigned long long int seqnum;
 		ssize_t devpath_len;
 
@@ -348,7 +348,7 @@ out:
 int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue,
 					       unsigned long long int start, unsigned long long int end)
 {
-	unsigned long long int seqnum = 0;
+	unsigned long long int seqnum;
 	ssize_t devpath_len;
 	int unfinished;
 	FILE *queue_file;
@@ -368,20 +368,33 @@ int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue,
 		fclose(queue_file);
 		return -EOVERFLOW;
 	}
-	unfinished = (end - start) + 1;
 
-	while (unfinished > 0) {
+	/*
+	 * we might start with 0, and handle the initial seqnum
+	 * only when we find an entry in the queue file
+	 **/
+	unfinished = end - start;
+
+	do {
 		if (udev_queue_read_seqnum(queue_file, &seqnum) < 0)
 			break;
 		devpath_len = udev_queue_skip_devpath(queue_file);
 		if (devpath_len < 0)
 			break;
 
+		/*
+		 * we might start with an empty or re-build queue file, where
+		 * the initial seqnum is not recorded as finished
+		 */
+		if (start == seqnum && devpath_len > 0)
+			unfinished++;
+
 		if (devpath_len == 0) {
 			if (seqnum >= start && seqnum <= end)
 				unfinished--;
 		}
-	}
+	} while (unfinished > 0);
+
 	fclose(queue_file);
 
 	return (unfinished == 0);
@@ -422,7 +435,7 @@ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev
 	if (queue_file == NULL)
 		return NULL;
 
-	while (1) {
+	for (;;) {
 		char syspath[UTIL_PATH_SIZE];
 		char *s;
 		size_t l;
@@ -471,7 +484,7 @@ struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev
 	if (udev_queue == NULL)
 		return NULL;
 	udev_list_cleanup_entries(udev_queue->udev, &udev_queue->failed_list);
-	util_strscpyl(path, sizeof(path), udev_get_dev_path(udev_queue->udev), "/.udev/failed", NULL);
+	util_strscpyl(path, sizeof(path), udev_get_run_path(udev_queue->udev), "/failed", NULL);
 	dir = opendir(path);
 	if (dir == NULL)
 		return NULL;