X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-queue.c;h=7ec22370104830db6fe88b5589b3bad7ad5f5029;hp=28d877749d7a6bf894206bc1331905d128eacbc0;hb=a5d8cffad9020247c9ba81a9e0a9b9cee5c4a4d5;hpb=86b5778857522087e74182f26f0e565adea0c699

diff --git a/udev/lib/libudev-queue.c b/udev/lib/libudev-queue.c
index 28d877749..7ec223701 100644
--- a/udev/lib/libudev-queue.c
+++ b/udev/lib/libudev-queue.c
@@ -133,6 +133,20 @@ unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue)
 	return seqnum;
 }
 
+int udev_queue_get_udev_is_active(struct udev_queue *udev_queue)
+{
+	char filename[UTIL_PATH_SIZE];
+	struct stat statbuf;
+
+	if (udev_queue == NULL)
+		return 0;
+	util_strlcpy(filename, udev_get_dev_path(udev_queue->udev), sizeof(filename));
+	util_strlcat(filename, "/.udev/uevent_seqnum", sizeof(filename));
+	if (stat(filename, &statbuf) == 0)
+		return 1;
+	return 0;
+}
+
 int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
 {
 	char queuename[UTIL_PATH_SIZE];
@@ -152,7 +166,10 @@ int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
 		dbg(udev_queue->udev, "queue is empty\n");
 		return 1;
 	}
-	udev_queue_get_udev_seqnum(udev_queue);
+	/* update udev seqnum, and check if udev is still running */
+	if (udev_queue_get_udev_seqnum(udev_queue) == 0)
+		if (!udev_queue_get_udev_is_active(udev_queue))
+			return 1;
 	if (seqnum_kernel <= udev_queue->last_seen_udev_seqnum) {
 		dbg(udev_queue->udev, "queue is empty\n");
 		return 1;
@@ -177,7 +194,7 @@ int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned lo
 	}
 	snprintf(filename, sizeof(filename), "%s/.udev/queue/%llu",
 		 udev_get_dev_path(udev_queue->udev), seqnum);
-	if (stat(filename, &statbuf) == 0)
+	if (lstat(filename, &statbuf) == 0)
 		return 0;
 	dbg(udev_queue->udev, "seqnum: %llu finished\n", seqnum);
 	return 1;