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

diff --git a/src/lookup_table.c b/src/lookup_table.c
index 6370f038..4d62ca5b 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>
@@ -39,7 +40,7 @@ new_lookup_table(size_t capacity)
 	struct wim_lookup_table *table;
 	struct hlist_head *array;
 
-	table = MALLOC(sizeof(struct wim_lookup_table));
+	table = CALLOC(1, sizeof(struct wim_lookup_table));
 	if (table) {
 		array = CALLOC(capacity, sizeof(array[0]));
 		if (array) {
@@ -214,7 +215,7 @@ finalize_lte(struct wim_lookup_table_entry *lte)
 	#ifdef WITH_FUSE
 	if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
 		unlink(lte->staging_file_name);
-		list_del(&lte->staging_list);
+		list_del(&lte->unhashed_list);
 	}
 	#endif
 	free_lookup_table_entry(lte);
@@ -231,7 +232,8 @@ lte_decrement_refcnt(struct wim_lookup_table_entry *lte,
 	wimlib_assert(lte != NULL);
 	wimlib_assert(lte->refcnt != 0);
 	if (--lte->refcnt == 0) {
-		lookup_table_unlink(table, lte);
+		if (!lte->unhashed)
+			lookup_table_unlink(table, lte);
 	#ifdef WITH_FUSE
 		if (lte->num_opened_fds == 0)
 	#endif
@@ -266,13 +268,66 @@ for_lookup_table_entry(struct wim_lookup_table *table,
 		{
 			wimlib_assert2(!(lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA));
 			ret = visitor(lte, arg);
-			if (ret != 0)
+			if (ret)
 				return ret;
 		}
 	}
 	return 0;
 }
 
+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;
+}
+
+
+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.
@@ -407,7 +462,7 @@ read_lookup_table(WIMStruct *w)
 			      w->current_image + 1,
 			      cur_entry->resource_entry.offset);
 			w->image_metadata[
-				w->current_image++].metadata_lte = cur_entry;
+				w->current_image++]->metadata_lte = cur_entry;
 		} else {
 			/* Lookup table entry for a stream that is not a
 			 * metadata resource */
@@ -498,6 +553,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;
@@ -508,7 +564,7 @@ write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry
 	for (int i = start_image; i <= end_image; i++) {
 		struct wim_lookup_table_entry *metadata_lte;
 
-		metadata_lte = w->image_metadata[i - 1].metadata_lte;
+		metadata_lte = w->image_metadata[i - 1]->metadata_lte;
 		metadata_lte->out_refcnt = 1;
 		metadata_lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
 		ret = write_lookup_table_entry(metadata_lte, out);
@@ -516,10 +572,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;
@@ -575,9 +633,13 @@ print_lookup_table_entry(const struct wim_lookup_table_entry *lte, FILE *out)
 	tfprintf(out, T("Part Number       = %hu\n"), lte->part_number);
 	tfprintf(out, T("Reference Count   = %u\n"), lte->refcnt);
 
-	tfprintf(out, T("Hash              = 0x"));
-	print_hash(lte->hash, out);
-	tputc(T('\n'), out);
+	if (lte->unhashed) {
+		tfprintf(out, T("(Unhashed, back ptr at %p)\n"), lte->my_ptr);
+	} else {
+		tfprintf(out, T("Hash              = 0x"));
+		print_hash(lte->hash, out);
+		tputc(T('\n'), out);
+	}
 
 	tfprintf(out, T("Flags             = "));
 	u8 flags = lte->resource_entry.flags;
@@ -829,3 +891,15 @@ lookup_table_total_stream_size(struct wim_lookup_table *table)
 	for_lookup_table_entry(table, lte_add_stream_size, &total_size);
 	return total_size;
 }
+
+void
+free_lte_list(struct list_head *list)
+{
+	struct wim_lookup_table_entry *lte, *tmp;
+
+	list_for_each_entry_safe(lte, tmp, list, staging_list) {
+		DEBUG("%p", lte);
+		free_lookup_table_entry(lte);
+}
+	INIT_LIST_HEAD(list);
+}