X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-queue.c;h=163e6229fefa49b63f1b93e7012b2cd1637460b0;hp=5a4a3dc095ccf236d106b9ebfba23a58990cdf29;hb=95ce1875d79162324a5eb67f6a0ffbbdd5d29921;hpb=60067cc75ac7dd583beea584f87f2f6d3358f3c1

diff --git a/libudev/libudev-queue.c b/libudev/libudev-queue.c
index 5a4a3dc09..163e6229f 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.
  */
 
@@ -131,7 +131,7 @@ unsigned long long int udev_get_kernel_seqnum(struct udev *udev)
 	ssize_t len;
 
 	util_strscpyl(filename, sizeof(filename), udev_get_sys_path(udev), "/kernel/uevent_seqnum", NULL);
-	fd = open(filename, O_RDONLY);
+	fd = open(filename, O_RDONLY|O_CLOEXEC);
 	if (fd < 0)
 		return 0;
 	len = read(fd, buf, sizeof(buf));
@@ -215,7 +215,7 @@ static FILE *open_queue_file(struct udev_queue *udev_queue, unsigned long long i
 	FILE *queue_file;
 
 	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue->udev), "/.udev/queue.bin", NULL);
-	queue_file = fopen(filename, "r");
+	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;