X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=66ff69dd8fae2b3fe62adad8759f1f15b1609463;hp=f22bfaf7cf7df4c995065b81eb0ba10a9af77b65;hb=bb11c4650a416d1eaf6c8f8385c3c6e4d5e0eff3;hpb=670a0ed6a1f36bebf71f0b221f3d78e497d305c2

diff --git a/src/lookup_table.c b/src/lookup_table.c
index f22bfaf7..66ff69dd 100644
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -24,14 +24,23 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "lookup_table.h"
-#include "buffer_io.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib/endianness.h"
+#include "wimlib/error.h"
+#include "wimlib/file_io.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/paths.h"
+#include "wimlib/resource.h"
+#include "wimlib/util.h"
+
 #include <errno.h>
 #include <stdlib.h>
-
 #ifdef WITH_FUSE
-#include <unistd.h>
+#  include <unistd.h> /* for unlink() */
 #endif
 
 struct wim_lookup_table *
@@ -50,15 +59,15 @@ new_lookup_table(size_t capacity)
 		} else {
 			FREE(table);
 			table = NULL;
-			ERROR("Failed to allocate memory for lookup table with capacity %zu",
-			      capacity);
+			ERROR("Failed to allocate memory for lookup table "
+			      "with capacity %zu", capacity);
 		}
 	}
 	return table;
 }
 
 struct wim_lookup_table_entry *
-new_lookup_table_entry()
+new_lookup_table_entry(void)
 {
 	struct wim_lookup_table_entry *lte;
 
@@ -79,11 +88,10 @@ clone_lookup_table_entry(const struct wim_lookup_table_entry *old)
 {
 	struct wim_lookup_table_entry *new;
 
-	new = MALLOC(sizeof(*new));
+	new = memdup(old, sizeof(struct wim_lookup_table_entry));
 	if (!new)
 		return NULL;
 
-	memcpy(new, old, sizeof(*old));
 	new->extracted_file = NULL;
 	switch (new->resource_location) {
 #ifdef __WIN32__
@@ -102,32 +110,30 @@ clone_lookup_table_entry(const struct wim_lookup_table_entry *old)
 			goto out_free;
 		break;
 	case RESOURCE_IN_ATTACHED_BUFFER:
-		new->attached_buffer = MALLOC(wim_resource_size(old));
+		new->attached_buffer = memdup(old->attached_buffer,
+					      wim_resource_size(old));
 		if (!new->attached_buffer)
 			goto out_free;
-		memcpy(new->attached_buffer, old->attached_buffer,
-		       wim_resource_size(old));
 		break;
 #ifdef WITH_NTFS_3G
 	case RESOURCE_IN_NTFS_VOLUME:
 		if (old->ntfs_loc) {
 			struct ntfs_location *loc;
-			loc = MALLOC(sizeof(*loc));
+			loc = memdup(old->ntfs_loc, sizeof(struct ntfs_location));
 			if (!loc)
 				goto out_free;
-			memcpy(loc, old->ntfs_loc, sizeof(*loc));
 			loc->path = NULL;
 			loc->stream_name = NULL;
 			new->ntfs_loc = loc;
 			loc->path = STRDUP(old->ntfs_loc->path);
 			if (!loc->path)
 				goto out_free;
-			loc->stream_name = MALLOC((loc->stream_name_nchars + 1) * 2);
-			if (!loc->stream_name)
-				goto out_free;
-			memcpy(loc->stream_name,
-			       old->ntfs_loc->stream_name,
-			       (loc->stream_name_nchars + 1) * 2);
+			if (loc->stream_name_nchars) {
+				loc->stream_name = memdup(old->ntfs_loc->stream_name,
+							  loc->stream_name_nchars * 2);
+				if (!loc->stream_name)
+					goto out_free;
+			}
 		}
 		break;
 #endif
@@ -240,7 +246,9 @@ lte_decrement_refcnt(struct wim_lookup_table_entry *lte,
 	wimlib_assert(lte != NULL);
 	wimlib_assert(lte->refcnt != 0);
 	if (--lte->refcnt == 0) {
-		if (!lte->unhashed)
+		if (lte->unhashed)
+			list_del(&lte->unhashed_list);
+		else
 			lookup_table_unlink(table, lte);
 	#ifdef WITH_FUSE
 		if (lte->num_opened_fds == 0)
@@ -340,6 +348,25 @@ for_lookup_table_entry_pos_sorted(struct wim_lookup_table *table,
 	return ret;
 }
 
+/* On-disk format of a WIM lookup table entry (stream entry). */
+struct wim_lookup_table_entry_disk {
+	/* Location, offset, compression status, and metadata status of the
+	 * stream. */
+	struct resource_entry_disk resource_entry;
+
+	/* Which part of the split WIM this stream is in; indexed from 1. */
+	le16 part_number;
+
+	/* Reference count of this stream over all WIM images. */
+	le32 refcnt;
+
+	/* SHA1 message digest of the uncompressed data of this stream, or
+	 * optionally all zeroes if this stream is of zero length. */
+	u8 hash[SHA1_HASH_SIZE];
+} _packed_attribute;
+
+#define WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE 50
+
 /*
  * Reads the lookup table from a WIM file.
  *
@@ -350,49 +377,62 @@ for_lookup_table_entry_pos_sorted(struct wim_lookup_table *table,
 int
 read_lookup_table(WIMStruct *w)
 {
-	u64 num_entries;
-	u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE];
 	int ret;
+	size_t num_entries;
 	struct wim_lookup_table *table;
 	struct wim_lookup_table_entry *cur_entry, *duplicate_entry;
+	struct wim_lookup_table_entry_disk
+			table_buf[BUFFER_SIZE / sizeof(struct wim_lookup_table_entry_disk)]
+				_aligned_attribute(8);
 
-	if (resource_is_compressed(&w->hdr.lookup_table_res_entry)) {
-		ERROR("Didn't expect a compressed lookup table!");
-		ERROR("Ask the author to implement support for this.");
-		return WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE;
-	}
+	BUILD_BUG_ON(sizeof(struct wim_lookup_table_entry_disk) !=
+		     WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE);
+
+	off_t offset;
+	size_t buf_entries_remaining;
+	const struct wim_lookup_table_entry_disk *disk_entry;
 
 	DEBUG("Reading lookup table: offset %"PRIu64", size %"PRIu64"",
 	      w->hdr.lookup_table_res_entry.offset,
 	      w->hdr.lookup_table_res_entry.original_size);
 
-	if (fseeko(w->fp, w->hdr.lookup_table_res_entry.offset, SEEK_SET) != 0)
-	{
-		ERROR_WITH_ERRNO("Failed to seek to byte %"PRIu64" to read "
-				 "lookup table",
-				 w->hdr.lookup_table_res_entry.offset);
-		return WIMLIB_ERR_READ;
+	if (resource_is_compressed(&w->hdr.lookup_table_res_entry)) {
+		ERROR("Didn't expect a compressed lookup table!");
+		ERROR("Ask the author to implement support for this.");
+		return WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE;
 	}
 
-	num_entries = w->hdr.lookup_table_res_entry.original_size /
-		      WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE;
+	num_entries = w->hdr.lookup_table_res_entry.size /
+		      sizeof(struct wim_lookup_table_entry_disk);
 	table = new_lookup_table(num_entries * 2 + 1);
-	if (!table)
+	if (!table) {
+		ERROR("Failed to allocate stream hash table of size %zu",
+		      num_entries * 2 + 1);
 		return WIMLIB_ERR_NOMEM;
+	}
 
 	w->current_image = 0;
-	while (num_entries--) {
-		const u8 *p;
-
-		if (fread(buf, 1, sizeof(buf), w->fp) != sizeof(buf)) {
-			if (feof(w->fp)) {
-				ERROR("Unexpected EOF in WIM lookup table!");
-			} else {
-				ERROR_WITH_ERRNO("Error reading WIM lookup "
-						 "table");
+	offset = w->hdr.lookup_table_res_entry.offset;
+	buf_entries_remaining = 0;
+	for (; num_entries != 0;
+	     num_entries--, buf_entries_remaining--, disk_entry++)
+	{
+		if (buf_entries_remaining == 0) {
+			size_t entries_to_read, bytes_to_read;
+
+			entries_to_read = min(ARRAY_LEN(table_buf), num_entries);
+			bytes_to_read = entries_to_read * sizeof(struct wim_lookup_table_entry_disk);
+			if (full_pread(w->in_fd, table_buf,
+				       bytes_to_read, offset) != bytes_to_read)
+			{
+				ERROR_WITH_ERRNO("Error reading lookup table "
+						 "(offset=%"PRIu64")", offset);
+				ret = WIMLIB_ERR_READ;
+				goto out_free_lookup_table;
 			}
-			ret = WIMLIB_ERR_READ;
-			goto out_free_lookup_table;
+			offset += bytes_to_read;
+			disk_entry = table_buf;
+			buf_entries_remaining = entries_to_read;
 		}
 		cur_entry = new_lookup_table_entry();
 		if (!cur_entry) {
@@ -402,63 +442,77 @@ read_lookup_table(WIMStruct *w)
 
 		cur_entry->wim = w;
 		cur_entry->resource_location = RESOURCE_IN_WIM;
-		p = get_resource_entry(buf, &cur_entry->resource_entry);
-		p = get_u16(p, &cur_entry->part_number);
-		p = get_u32(p, &cur_entry->refcnt);
-		p = get_bytes(p, SHA1_HASH_SIZE, cur_entry->hash);
+		get_resource_entry(&disk_entry->resource_entry, &cur_entry->resource_entry);
+		cur_entry->part_number = le16_to_cpu(disk_entry->part_number);
+		cur_entry->refcnt = le32_to_cpu(disk_entry->refcnt);
+		copy_hash(cur_entry->hash, disk_entry->hash);
+
+		if (cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
+			cur_entry->compression_type = w->compression_type;
+		else
+			BUILD_BUG_ON(WIMLIB_COMPRESSION_TYPE_NONE != 0);
 
 		if (cur_entry->part_number != w->hdr.part_number) {
-			ERROR("A lookup table entry in part %hu of the WIM "
-			      "points to part %hu",
-			      w->hdr.part_number, cur_entry->part_number);
-			ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
-			goto out_free_cur_entry;
+			WARNING("A lookup table entry in part %hu of the WIM "
+				"points to part %hu (ignoring it)",
+				w->hdr.part_number, cur_entry->part_number);
+			free_lookup_table_entry(cur_entry);
+			continue;
 		}
 
 		if (is_zero_hash(cur_entry->hash)) {
-			ERROR("The WIM lookup table contains an entry with a "
-			      "SHA1 message digest of all 0's");
-			ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
-			goto out_free_cur_entry;
+			WARNING("The WIM lookup table contains an entry with a "
+				"SHA1 message digest of all 0's (ignoring it)");
+			free_lookup_table_entry(cur_entry);
+			continue;
 		}
 
 		if (!(cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
 		    && (cur_entry->resource_entry.size !=
 		        cur_entry->resource_entry.original_size))
 		{
-		#ifdef ENABLE_ERROR_MESSAGES
-			ERROR("Found uncompressed resource with original size "
-			      "not the same as compressed size");
-			ERROR("The lookup table entry for the resource is as follows:");
-			print_lookup_table_entry(cur_entry, stderr);
-		#endif
-			ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
-			goto out_free_cur_entry;
+			if (wimlib_print_errors) {
+				WARNING("Found uncompressed resource with "
+					"original size (%"PRIu64") not the same "
+					"as compressed size (%"PRIu64")",
+					cur_entry->resource_entry.original_size,
+					cur_entry->resource_entry.size);
+				if (cur_entry->resource_entry.original_size) {
+					WARNING("Overriding compressed size with original size.");
+					cur_entry->resource_entry.size =
+						cur_entry->resource_entry.original_size;
+				} else {
+					WARNING("Overriding original size with compressed size");
+					cur_entry->resource_entry.original_size =
+						cur_entry->resource_entry.size;
+				}
+			}
 		}
 
 		if (cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) {
 			/* Lookup table entry for a metadata resource */
 			if (cur_entry->refcnt != 1) {
-			#ifdef ENABLE_ERROR_MESSAGES
-				ERROR("Found metadata resource with refcnt != 1:");
-				print_lookup_table_entry(cur_entry, stderr);
-			#endif
+				if (wimlib_print_errors) {
+					ERROR("Found metadata resource with refcnt != 1:");
+					print_lookup_table_entry(cur_entry, stderr);
+				}
 				ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
 				goto out_free_cur_entry;
 			}
 
 			if (w->hdr.part_number != 1) {
-				ERROR("Found a metadata resource in a "
-				      "non-first part of the split WIM!");
-				ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
-				goto out_free_cur_entry;
+				WARNING("Ignoring metadata resource found in a "
+					"non-first part of the split WIM");
+				free_lookup_table_entry(cur_entry);
+				continue;
 			}
 			if (w->current_image == w->hdr.image_count) {
-				ERROR("The WIM header says there are %u images "
-				      "in the WIM, but we found more metadata "
-				      "resources than this", w->hdr.image_count);
-				ret = WIMLIB_ERR_IMAGE_COUNT;
-				goto out_free_cur_entry;
+				WARNING("The WIM header says there are %u images "
+					"in the WIM, but we found more metadata "
+					"resources than this (ignoring the extra)",
+					w->hdr.image_count);
+				free_lookup_table_entry(cur_entry);
+				continue;
 			}
 
 			/* Notice very carefully:  We are assigning the metadata
@@ -479,29 +533,31 @@ read_lookup_table(WIMStruct *w)
 			 * metadata resource */
 			duplicate_entry = __lookup_resource(table, cur_entry->hash);
 			if (duplicate_entry) {
-			#ifdef ENABLE_ERROR_MESSAGES
-				ERROR("The WIM lookup table contains two entries with the "
-				      "same SHA1 message digest!");
-				ERROR("The first entry is:");
-				print_lookup_table_entry(duplicate_entry, stderr);
-				ERROR("The second entry is:");
-				print_lookup_table_entry(cur_entry, stderr);
-			#endif
-				ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
-				goto out_free_cur_entry;
+				if (wimlib_print_errors) {
+					WARNING("The WIM lookup table contains two entries with the "
+					      "same SHA1 message digest!");
+					WARNING("The first entry is:");
+					print_lookup_table_entry(duplicate_entry, stderr);
+					WARNING("The second entry is:");
+					print_lookup_table_entry(cur_entry, stderr);
+				}
+				free_lookup_table_entry(cur_entry);
+				continue;
+			} else {
+				lookup_table_insert(table, cur_entry);
 			}
-			lookup_table_insert(table, cur_entry);
 		}
 	}
 
-	if (w->hdr.part_number == 1 &&
-	    w->current_image != w->hdr.image_count)
-	{
-		ERROR("The WIM header says there are %u images "
-		      "in the WIM, but we only found %d metadata "
-		      "resources!", w->hdr.image_count, w->current_image);
-		ret = WIMLIB_ERR_IMAGE_COUNT;
-		goto out_free_lookup_table;
+	if (w->hdr.part_number == 1 && w->current_image != w->hdr.image_count) {
+		WARNING("The header of \"%"TS"\" says there are %u images in\n"
+			"          the WIM, but we only found %d metadata resources!  Acting as if\n"
+			"          the header specified only %d images instead.",
+			w->filename, w->hdr.image_count,
+			w->current_image, w->current_image);
+		for (int i = w->current_image; i < w->hdr.image_count; i++)
+			put_image_metadata(w->image_metadata[i], NULL);
+		w->hdr.image_count = w->current_image;
 	}
 	DEBUG("Done reading lookup table.");
 	w->lookup_table = table;
@@ -517,37 +573,74 @@ out:
 }
 
 
-/*
- * Writes a lookup table entry to the output file.
- */
-int
-write_lookup_table_entry(struct wim_lookup_table_entry *lte, void *_out)
+static void
+write_lookup_table_entry(const struct wim_lookup_table_entry *lte,
+			 struct wim_lookup_table_entry_disk *disk_entry)
 {
-	FILE *out;
-	u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE];
-	u8 *p;
-
-	out = _out;
+	put_resource_entry(&lte->output_resource_entry, &disk_entry->resource_entry);
+	disk_entry->part_number = cpu_to_le16(lte->part_number);
+	disk_entry->refcnt = cpu_to_le32(lte->out_refcnt);
+	copy_hash(disk_entry->hash, lte->hash);
+}
 
-	/* Don't write entries that have not had file resources or metadata
-	 * resources written for them. */
-	if (lte->out_refcnt == 0)
-		return 0;
+int
+write_lookup_table_from_stream_list(struct list_head *stream_list,
+				    int out_fd,
+				    struct resource_entry *out_res_entry)
+{
+	int ret;
+	off_t start_offset;
+	struct wim_lookup_table_entry_disk
+			table_buf[BUFFER_SIZE / sizeof(struct wim_lookup_table_entry_disk)]
+				_aligned_attribute(8);
+	size_t table_size;
+	size_t bytes_to_write;
+	struct wim_lookup_table_entry *lte;
+	size_t cur_idx;
 
-	if (lte->output_resource_entry.flags & WIM_RESHDR_FLAG_METADATA) {
-		DEBUG("Writing metadata entry at %"PRIu64" "
-		      "(orig size = %"PRIu64")",
-		      ftello(out), lte->output_resource_entry.original_size);
+	start_offset = filedes_offset(out_fd);
+	if (start_offset == -1)
+		goto write_error;
+
+	table_size = 0;
+	cur_idx = 0;
+	list_for_each_entry(lte, stream_list, lookup_table_list) {
+		if (cur_idx == ARRAY_LEN(table_buf)) {
+			bytes_to_write = sizeof(table_buf);
+			if (full_write(out_fd, table_buf,
+				       bytes_to_write) != bytes_to_write)
+				goto write_error;
+			table_size += bytes_to_write;
+			cur_idx = 0;
+		}
+		write_lookup_table_entry(lte, &table_buf[cur_idx]);
+		cur_idx++;
 	}
-
-	p = put_resource_entry(buf, &lte->output_resource_entry);
-	p = put_u16(p, lte->part_number);
-	p = put_u32(p, lte->out_refcnt);
-	p = put_bytes(p, SHA1_HASH_SIZE, lte->hash);
-	if (fwrite(buf, 1, sizeof(buf), out) != sizeof(buf)) {
-		ERROR_WITH_ERRNO("Failed to write lookup table entry");
-		return WIMLIB_ERR_WRITE;
+	if (cur_idx != 0) {
+		bytes_to_write = cur_idx * sizeof(struct wim_lookup_table_entry_disk);
+		if (full_write(out_fd, table_buf,
+			       bytes_to_write) != bytes_to_write)
+			goto write_error;
+		table_size += bytes_to_write;
 	}
+	out_res_entry->offset        = start_offset;
+	out_res_entry->size          = table_size;
+	out_res_entry->original_size = table_size;
+	out_res_entry->flags         = WIM_RESHDR_FLAG_METADATA;
+	ret = 0;
+out:
+	return ret;
+write_error:
+	ERROR_WITH_ERRNO("Failed to write lookup table");
+	ret = WIMLIB_ERR_WRITE;
+	goto out;
+}
+
+static int
+append_lookup_table_entry(struct wim_lookup_table_entry *lte, void *_list)
+{
+	if (lte->out_refcnt != 0)
+		list_add_tail(&lte->lookup_table_list, (struct list_head*)_list);
 	return 0;
 }
 
@@ -555,16 +648,10 @@ write_lookup_table_entry(struct wim_lookup_table_entry *lte, void *_out)
 int
 write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry)
 {
-	FILE *out = w->out_fp;
-	off_t start_offset, end_offset;
-	int ret;
-	int start_image, end_image;
-
-	start_offset = ftello(out);
-	if (start_offset == -1)
-		return WIMLIB_ERR_WRITE;
+	LIST_HEAD(stream_list);
+	int start_image;
+	int end_image;
 
-	/* Write lookup table entries for metadata resources */
 	if (image == WIMLIB_ALL_IMAGES) {
 		start_image = 1;
 		end_image = w->hdr.image_count;
@@ -572,32 +659,21 @@ write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry
 		start_image = image;
 		end_image = image;
 	}
+
 	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->out_refcnt = 1;
 		metadata_lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
-		ret = write_lookup_table_entry(metadata_lte, out);
-		if (ret)
-			return ret;
+		append_lookup_table_entry(metadata_lte, &stream_list);
 	}
-
-	/* 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;
-
-	out_res_entry->offset        = start_offset;
-	out_res_entry->size          = end_offset - start_offset;
-	out_res_entry->original_size = end_offset - start_offset;
-	out_res_entry->flags         = WIM_RESHDR_FLAG_METADATA;
-	return 0;
+	for_lookup_table_entry(w->lookup_table,
+			       append_lookup_table_entry,
+			       &stream_list);
+	return write_lookup_table_from_stream_list(&stream_list,
+						   w->out_fd,
+						   out_res_entry);
 }
 
 int
@@ -691,6 +767,58 @@ print_lookup_table_entry(const struct wim_lookup_table_entry *lte, FILE *out)
 	tputc(T('\n'), out);
 }
 
+void
+lte_to_wimlib_resource_entry(const struct wim_lookup_table_entry *lte,
+			     struct wimlib_resource_entry *wentry)
+{
+	wentry->uncompressed_size = lte->resource_entry.original_size;
+	wentry->compressed_size = lte->resource_entry.size;
+	wentry->offset = lte->resource_entry.offset;
+	copy_hash(wentry->sha1_hash, lte->hash);
+	wentry->part_number = lte->part_number;
+	wentry->reference_count = lte->refcnt;
+	wentry->is_compressed = (lte->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED) != 0;
+	wentry->is_metadata = (lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) != 0;
+	wentry->is_free = (lte->resource_entry.flags & WIM_RESHDR_FLAG_FREE) != 0;
+	wentry->is_spanned = (lte->resource_entry.flags & WIM_RESHDR_FLAG_SPANNED) != 0;
+}
+
+struct iterate_lte_context {
+	wimlib_iterate_lookup_table_callback_t cb;
+	void *user_ctx;
+};
+
+static int
+do_iterate_lte(struct wim_lookup_table_entry *lte, void *_ctx)
+{
+	struct iterate_lte_context *ctx = _ctx;
+	struct wimlib_resource_entry entry;
+
+	lte_to_wimlib_resource_entry(lte, &entry);
+	return (*ctx->cb)(&entry, ctx->user_ctx);
+}
+
+WIMLIBAPI int
+wimlib_iterate_lookup_table(WIMStruct *wim, int flags,
+			    wimlib_iterate_lookup_table_callback_t cb,
+			    void *user_ctx)
+{
+	struct iterate_lte_context ctx = {
+		.cb = cb,
+		.user_ctx = user_ctx,
+	};
+	if (wim->hdr.part_number == 1) {
+		int ret;
+		for (int i = 0; i < wim->hdr.image_count; i++) {
+			ret = do_iterate_lte(wim->image_metadata[i]->metadata_lte,
+					     &ctx);
+			if (ret)
+				return ret;
+		}
+	}
+	return for_lookup_table_entry(wim->lookup_table, do_iterate_lte, &ctx);
+}
+
 static int
 do_print_lookup_table_entry(struct wim_lookup_table_entry *lte, void *fp)
 {
@@ -699,12 +827,14 @@ do_print_lookup_table_entry(struct wim_lookup_table_entry *lte, void *fp)
 }
 
 /*
- * Prints the lookup table of a WIM file.
+ * Deprecated
  */
 WIMLIBAPI void
-wimlib_print_lookup_table(WIMStruct *w)
+wimlib_print_lookup_table(WIMStruct *wim)
 {
-	for_lookup_table_entry(w->lookup_table,
+	for (int i = 0; i < wim->hdr.image_count; i++)
+		print_lookup_table_entry(wim->image_metadata[i]->metadata_lte, stdout);
+	for_lookup_table_entry(wim->lookup_table,
 			       do_print_lookup_table_entry,
 			       stdout);
 }
@@ -766,7 +896,9 @@ lookup_resource(WIMStruct *w,
 
 	inode = dentry->d_inode;
 
-	wimlib_assert(inode->i_resolved);
+	if (!inode->i_resolved)
+		if (inode_resolve_ltes(inode, w->lookup_table))
+			return -EIO;
 
 	if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK)
 	      && inode_is_directory(inode))
@@ -808,24 +940,52 @@ out:
  * This function always succeeds; unresolved lookup table entries are given a
  * NULL pointer.
  */
-void
+int
 inode_resolve_ltes(struct wim_inode *inode, struct wim_lookup_table *table)
 {
+	const u8 *hash;
 
 	if (!inode->i_resolved) {
-		struct wim_lookup_table_entry *lte;
+		struct wim_lookup_table_entry *lte, *ads_lte;
+
 		/* Resolve the default file stream */
-		lte = __lookup_resource(table, inode->i_hash);
-		inode->i_lte = lte;
-		inode->i_resolved = 1;
+		lte = NULL;
+		hash = inode->i_hash;
+		if (!is_zero_hash(hash)) {
+			lte = __lookup_resource(table, hash);
+			if (unlikely(!lte))
+				goto resource_not_found;
+		}
 
 		/* Resolve the alternate data streams */
+		struct wim_lookup_table_entry *ads_ltes[inode->i_num_ads];
 		for (u16 i = 0; i < inode->i_num_ads; i++) {
-			struct wim_ads_entry *cur_entry = &inode->i_ads_entries[i];
-			lte = __lookup_resource(table, cur_entry->hash);
-			cur_entry->lte = lte;
+			struct wim_ads_entry *cur_entry;
+
+			ads_lte = NULL;
+			cur_entry = &inode->i_ads_entries[i];
+			hash = cur_entry->hash;
+			if (!is_zero_hash(hash)) {
+				ads_lte = __lookup_resource(table, hash);
+				if (unlikely(!ads_lte))
+					goto resource_not_found;
+			}
+			ads_ltes[i] = ads_lte;
 		}
+		inode->i_lte = lte;
+		for (u16 i = 0; i < inode->i_num_ads; i++)
+			inode->i_ads_entries[i].lte = ads_ltes[i];
+		inode->i_resolved = 1;
 	}
+	return 0;
+resource_not_found:
+	if (wimlib_print_errors) {
+		ERROR("\"%"TS"\": resource not found", inode_first_full_path(inode));
+		tfprintf(stderr, T("        SHA-1 message digest of missing resource:\n        "));
+		print_hash(hash, stderr);
+		tputc(T('\n'), stderr);
+	}
+	return WIMLIB_ERR_RESOURCE_NOT_FOUND;
 }
 
 void
@@ -865,6 +1025,34 @@ inode_stream_lte(const struct wim_inode *inode, unsigned stream_idx,
 		return inode_stream_lte_unresolved(inode, stream_idx, table);
 }
 
+struct wim_lookup_table_entry *
+inode_unnamed_lte_resolved(const struct wim_inode *inode)
+{
+	wimlib_assert(inode->i_resolved);
+	for (unsigned i = 0; i <= inode->i_num_ads; i++) {
+		if (inode_stream_name_nbytes(inode, i) == 0 &&
+		    !is_zero_hash(inode_stream_hash_resolved(inode, i)))
+		{
+			return inode_stream_lte_resolved(inode, i);
+		}
+	}
+	return NULL;
+}
+
+struct wim_lookup_table_entry *
+inode_unnamed_lte_unresolved(const struct wim_inode *inode,
+			     const struct wim_lookup_table *table)
+{
+	wimlib_assert(!inode->i_resolved);
+	for (unsigned i = 0; i <= inode->i_num_ads; i++) {
+		if (inode_stream_name_nbytes(inode, i) == 0 &&
+		    !is_zero_hash(inode_stream_hash_unresolved(inode, i)))
+		{
+			return inode_stream_lte_unresolved(inode, i, table);
+		}
+	}
+	return NULL;
+}
 
 /* Return the lookup table entry for the unnamed data stream of an inode, or
  * NULL if there is none.
@@ -981,4 +1169,3 @@ hash_unhashed_stream(struct wim_lookup_table_entry *lte,
 		*lte_ret = lte;
 	return 0;
 }
-