X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=064215ec0cf75529de50fe677ea758dbdd2fff5b;hp=6370f03873440edf83e634bc7264a0a5b1d4ca67;hb=a8972bde4b080d2dd33a7500705d431b0f1fe901;hpb=f8698b9c814a62a117982701b9551f699553b2a4

diff --git a/src/lookup_table.c b/src/lookup_table.c
index 6370f038..064215ec 100644
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -28,6 +28,7 @@
 #include "lookup_table.h"
 #include "buffer_io.h"
 #include <errno.h>
+#include <stdlib.h>
 
 #ifdef WITH_FUSE
 #include <unistd.h>
@@ -273,6 +274,93 @@ for_lookup_table_entry(struct wim_lookup_table *table,
 	return 0;
 }
 
+static int
+cmp_streams_by_wim_position(const void *p1, const void *p2)
+{
+	const struct wim_lookup_table_entry *lte1, *lte2;
+	lte1 = *(const struct wim_lookup_table_entry**)p1;
+	lte2 = *(const struct wim_lookup_table_entry**)p2;
+	if (lte1->resource_entry.offset < lte2->resource_entry.offset)
+		return -1;
+	else if (lte1->resource_entry.offset > lte2->resource_entry.offset)
+		return 1;
+	else
+		return 0;
+}
+
+int
+sort_stream_list_by_wim_position(struct list_head *stream_list)
+{
+	struct list_head *cur;
+	size_t num_streams;
+	struct wim_lookup_table_entry **array;
+	size_t i;
+	size_t array_size;
+
+	num_streams = 0;
+	list_for_each(cur, stream_list)
+		num_streams++;
+	array_size = num_streams * sizeof(array[0]);
+	array = MALLOC(array_size);
+	if (!array) {
+		ERROR("Failed to allocate %zu bytes to sort stream entries",
+		      array_size);
+		return WIMLIB_ERR_NOMEM;
+	}
+	cur = stream_list->next;
+	for (i = 0; i < num_streams; i++) {
+		array[i] = container_of(cur, struct wim_lookup_table_entry, staging_list);
+		cur = cur->next;
+	}
+
+	qsort(array, num_streams, sizeof(array[0]), cmp_streams_by_wim_position);
+
+	INIT_LIST_HEAD(stream_list);
+	for (i = 0; i < num_streams; i++)
+		list_add_tail(&array[i]->staging_list, stream_list);
+	FREE(array);
+	return 0;
+}
+
+
+static int
+add_lte_to_array(struct wim_lookup_table_entry *lte,
+		 void *_pp)
+{
+	struct wim_lookup_table_entry ***pp = _pp;
+	*(*pp)++ = lte;
+	return 0;
+}
+
+/* Iterate through the lookup table entries, but first sort them by stream
+ * offset in the WIM.  Caution: this is intended to be used when the stream
+ * offset field has actually been set. */
+int
+for_lookup_table_entry_pos_sorted(struct wim_lookup_table *table,
+				  int (*visitor)(struct wim_lookup_table_entry *,
+						 void *),
+				  void *arg)
+{
+	struct wim_lookup_table_entry **lte_array, **p;
+	size_t num_streams = table->num_entries;
+	int ret;
+
+	lte_array = MALLOC(num_streams * sizeof(lte_array[0]));
+	if (!lte_array)
+		return WIMLIB_ERR_NOMEM;
+	p = lte_array;
+	for_lookup_table_entry(table, add_lte_to_array, &p);
+
+	wimlib_assert(p == lte_array + num_streams);
+
+	qsort(lte_array, num_streams, sizeof(lte_array[0]),
+	      cmp_streams_by_wim_position);
+	ret = 0;
+	for (size_t i = 0; i < num_streams && ret == 0; i++)
+		ret = visitor(lte_array[i], arg);
+	FREE(lte_array);
+	return ret;
+}
 
 /*
  * Reads the lookup table from a WIM file.
@@ -498,6 +586,7 @@ write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry
 	if (start_offset == -1)
 		return WIMLIB_ERR_WRITE;
 
+	/* Write lookup table entries for metadata resources */
 	if (image == WIMLIB_ALL_IMAGES) {
 		start_image = 1;
 		end_image = w->hdr.image_count;
@@ -516,10 +605,12 @@ write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry
 			return ret;
 	}
 
+	/* Write lookup table entries for other resources */
 	ret = for_lookup_table_entry(w->lookup_table, write_lookup_table_entry, out);
 	if (ret)
 		return ret;
 
+	/* Fill in the resource entry for the lookup table itself */
 	end_offset = ftello(out);
 	if (end_offset == -1)
 		return WIMLIB_ERR_WRITE;