]> wimlib.net Git - wimlib/blobdiff - src/lookup_table.c
Improve write streams performance and handling of joins
[wimlib] / src / lookup_table.c
index b79381f00bdd1e4273341b0454d9925e1771248a..15f5c0830c382fb501d9dc13ff5dbcc3513f85a8 100644 (file)
@@ -2,7 +2,7 @@
  * lookup_table.c
  *
  * Lookup table, implemented as a hash table, that maps SHA1 message digests to
- * data streams.
+ * data streams; plus code to read and write the corresponding on-disk data.
  */
 
 /*
@@ -36,6 +36,7 @@
 #include "wimlib/paths.h"
 #include "wimlib/resource.h"
 #include "wimlib/util.h"
+#include "wimlib/write.h"
 
 #include <errno.h>
 #include <stdlib.h>
@@ -94,11 +95,9 @@ clone_lookup_table_entry(const struct wim_lookup_table_entry *old)
 
        new->extracted_file = NULL;
        switch (new->resource_location) {
+       case RESOURCE_IN_FILE_ON_DISK:
 #ifdef __WIN32__
-       case RESOURCE_WIN32:
        case RESOURCE_WIN32_ENCRYPTED:
-#else
-       case RESOURCE_IN_FILE_ON_DISK:
 #endif
 #ifdef WITH_FUSE
        case RESOURCE_IN_STAGING_FILE:
@@ -151,11 +150,9 @@ free_lookup_table_entry(struct wim_lookup_table_entry *lte)
 {
        if (lte) {
                switch (lte->resource_location) {
+               case RESOURCE_IN_FILE_ON_DISK:
        #ifdef __WIN32__
-               case RESOURCE_WIN32:
                case RESOURCE_WIN32_ENCRYPTED:
-       #else
-               case RESOURCE_IN_FILE_ON_DISK:
        #endif
        #ifdef WITH_FUSE
                case RESOURCE_IN_STAGING_FILE:
@@ -291,18 +288,104 @@ for_lookup_table_entry(struct wim_lookup_table *table,
        return 0;
 }
 
-int
-cmp_streams_by_wim_position(const void *p1, const void *p2)
+/* qsort() callback that sorts streams (represented by `struct
+ * wim_lookup_table_entry's) into an order optimized for reading and writing.
+ *
+ * Sorting is done primarily by resource location, then secondarily by a
+ * per-resource location order.  For example, resources in WIM files are sorted
+ * primarily by part number, then secondarily by offset, as to implement optimal
+ * reading of either a standalone or split WIM.  */
+static int
+cmp_streams_by_sequential_order(const void *p1, const void *p2)
 {
        const struct wim_lookup_table_entry *lte1, *lte2;
+       int v;
+
        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
+
+       v = (int)lte1->resource_location - (int)lte2->resource_location;
+
+       /* Different resource locations?  */
+       if (v)
+               return v;
+
+       switch (lte1->resource_location) {
+       case RESOURCE_IN_WIM:
+
+               /* Different (possibly split) WIMs?  */
+               if (lte1->wim != lte2->wim) {
+                       v = memcmp(lte1->wim->hdr.guid, lte2->wim->hdr.guid,
+                                  WIM_GID_LEN);
+                       if (v)
+                               return v;
+               }
+
+               /* Different part numbers in the same WIM?  */
+               v = (int)lte1->wim->hdr.part_number - (int)lte2->wim->hdr.part_number;
+               if (v)
+                       return v;
+
+               /* Compare by offset.  */
+               if (lte1->resource_entry.offset < lte2->resource_entry.offset)
+                       return -1;
+               else if (lte1->resource_entry.offset > lte2->resource_entry.offset)
+                       return 1;
+               return 0;
+       case RESOURCE_IN_FILE_ON_DISK:
+#ifdef __WIN32__
+       case RESOURCE_WIN32_ENCRYPTED:
+#endif
+               /* Compare files by path: just a heuristic that will place files
+                * in the same directory next to each other.  */
+               return tstrcmp(lte1->file_on_disk, lte2->file_on_disk);
+#ifdef WITH_NTFS_3G
+       case RESOURCE_IN_NTFS_VOLUME:
+               return tstrcmp(lte1->ntfs_loc->path, lte2->ntfs_loc->path);
+#endif
+       default:
+               /* No additional sorting order defined for this resource
+                * location (e.g. RESOURCE_IN_ATTACHED_BUFFER); simply compare
+                * everything equal to each other.  */
                return 0;
+       }
+}
+
+int
+sort_stream_list_by_sequential_order(struct list_head *stream_list,
+                                    size_t list_head_offset)
+{
+       struct list_head *cur;
+       struct wim_lookup_table_entry **array;
+       size_t i;
+       size_t array_size;
+       size_t num_streams = 0;
+
+       list_for_each(cur, stream_list)
+               num_streams++;
+
+       array_size = num_streams * sizeof(array[0]);
+       array = MALLOC(array_size);
+       if (!array)
+               return WIMLIB_ERR_NOMEM;
+       cur = stream_list->next;
+       for (i = 0; i < num_streams; i++) {
+               array[i] = (struct wim_lookup_table_entry*)((u8*)cur -
+                                                           list_head_offset);
+               cur = cur->next;
+       }
+
+       qsort(array, num_streams, sizeof(array[0]),
+             cmp_streams_by_sequential_order);
+
+       INIT_LIST_HEAD(stream_list);
+       for (i = 0; i < num_streams; i++) {
+               list_add_tail((struct list_head*)
+                              ((u8*)array[i] + list_head_offset),
+                             stream_list);
+       }
+       FREE(array);
+       return 0;
 }
 
 
@@ -337,7 +420,7 @@ for_lookup_table_entry_pos_sorted(struct wim_lookup_table *table,
        wimlib_assert(p == lte_array + num_streams);
 
        qsort(lte_array, num_streams, sizeof(lte_array[0]),
-             cmp_streams_by_wim_position);
+             cmp_streams_by_sequential_order);
        ret = 0;
        for (size_t i = 0; i < num_streams; i++) {
                ret = visitor(lte_array[i], arg);
@@ -367,90 +450,93 @@ struct wim_lookup_table_entry_disk {
 
 #define WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE 50
 
+void
+lte_init_wim(struct wim_lookup_table_entry *lte, WIMStruct *wim)
+{
+       lte->resource_location = RESOURCE_IN_WIM;
+       lte->wim = wim;
+       if (lte->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
+               lte->compression_type = wim->compression_type;
+       else
+               lte->compression_type = WIMLIB_COMPRESSION_TYPE_NONE;
+
+       if (wim_is_pipable(wim))
+               lte->is_pipable = 1;
+}
+
 /*
  * Reads the lookup table from a WIM file.
  *
  * Saves lookup table entries for non-metadata streams in a hash table, and
  * saves the metadata entry for each image in a special per-image location (the
  * image_metadata array).
+ *
+ * Return values:
+ *     WIMLIB_ERR_SUCCESS (0)
+ *     WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY
+ *     WIMLIB_ERR_RESOURCE_NOT_FOUND
  */
 int
-read_lookup_table(WIMStruct *w)
+read_wim_lookup_table(WIMStruct *wim)
 {
        int ret;
+       size_t i;
        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);
+       struct wim_lookup_table_entry_disk *buf;
 
        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 (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;
-       }
+             wim->hdr.lookup_table_res_entry.offset,
+             wim->hdr.lookup_table_res_entry.size);
 
-       num_entries = w->hdr.lookup_table_res_entry.size /
+       /* Calculate number of entries in the lookup table.  */
+       num_entries = wim->hdr.lookup_table_res_entry.size /
                      sizeof(struct wim_lookup_table_entry_disk);
+
+
+       /* Read the lookup table into a buffer.  */
+       ret = res_entry_to_data(&wim->hdr.lookup_table_res_entry, wim,
+                               (void**)&buf);
+       if (ret)
+               goto out;
+
+       /* Allocate hash table.  */
        table = new_lookup_table(num_entries * 2 + 1);
        if (!table) {
-               ERROR("Failed to allocate stream hash table of size %zu",
-                     num_entries * 2 + 1);
-               return WIMLIB_ERR_NOMEM;
+               ERROR("Not enough memory to read lookup table.");
+               ret = WIMLIB_ERR_NOMEM;
+               goto out_free_buf;
        }
 
-       w->current_image = 0;
-       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;
-                       }
-                       offset += bytes_to_read;
-                       disk_entry = table_buf;
-                       buf_entries_remaining = entries_to_read;
-               }
+       /* Allocate and initalize `struct wim_lookup_table_entry's from the
+        * on-disk lookup table.  */
+       wim->current_image = 0;
+       for (i = 0; i < num_entries; i++) {
+               const struct wim_lookup_table_entry_disk *disk_entry = &buf[i];
+
                cur_entry = new_lookup_table_entry();
                if (!cur_entry) {
+                       ERROR("Not enough memory to read lookup table.");
                        ret = WIMLIB_ERR_NOMEM;
                        goto out_free_lookup_table;
                }
 
-               cur_entry->wim = w;
+               cur_entry->wim = wim;
                cur_entry->resource_location = RESOURCE_IN_WIM;
                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);
+               lte_init_wim(cur_entry, wim);
 
-               if (cur_entry->part_number != w->hdr.part_number) {
+               if (cur_entry->part_number != wim->hdr.part_number) {
                        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);
+                               wim->hdr.part_number, cur_entry->part_number);
                        free_lookup_table_entry(cur_entry);
                        continue;
                }
@@ -495,17 +581,17 @@ read_lookup_table(WIMStruct *w)
                                goto out_free_cur_entry;
                        }
 
-                       if (w->hdr.part_number != 1) {
+                       if (wim->hdr.part_number != 1) {
                                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) {
+                       if (wim->current_image == wim->hdr.image_count) {
                                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);
+                                       wim->hdr.image_count);
                                free_lookup_table_entry(cur_entry);
                                continue;
                        }
@@ -519,10 +605,10 @@ read_lookup_table(WIMStruct *w)
                         * written in the XML data. */
                        DEBUG("Found metadata resource for image %u at "
                              "offset %"PRIu64".",
-                             w->current_image + 1,
+                             wim->current_image + 1,
                              cur_entry->resource_entry.offset);
-                       w->image_metadata[
-                               w->current_image++]->metadata_lte = cur_entry;
+                       wim->image_metadata[
+                               wim->current_image++]->metadata_lte = cur_entry;
                } else {
                        /* Lookup table entry for a stream that is not a
                         * metadata resource */
@@ -544,31 +630,35 @@ read_lookup_table(WIMStruct *w)
                }
        }
 
-       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 (wim->hdr.part_number == 1 && wim->current_image != wim->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.",
+                       wim->filename, wim->hdr.image_count,
+                       wim->current_image, wim->current_image);
+               for (int i = wim->current_image; i < wim->hdr.image_count; i++)
+                       put_image_metadata(wim->image_metadata[i], NULL);
+               wim->hdr.image_count = wim->current_image;
        }
        DEBUG("Done reading lookup table.");
-       w->lookup_table = table;
+       wim->lookup_table = table;
        ret = 0;
-       goto out;
+       goto out_free_buf;
 out_free_cur_entry:
        FREE(cur_entry);
 out_free_lookup_table:
        free_lookup_table(table);
+out_free_buf:
+       FREE(buf);
 out:
-       w->current_image = 0;
+       wim->current_image = 0;
        return ret;
 }
 
 
 static void
-write_lookup_table_entry(const struct wim_lookup_table_entry *lte,
-                        struct wim_lookup_table_entry_disk *disk_entry)
+write_wim_lookup_table_entry(const struct wim_lookup_table_entry *lte,
+                            struct wim_lookup_table_entry_disk *disk_entry)
 {
        put_resource_entry(&lte->output_resource_entry, &disk_entry->resource_entry);
        disk_entry->part_number = cpu_to_le16(lte->part_number);
@@ -576,57 +666,47 @@ write_lookup_table_entry(const struct wim_lookup_table_entry *lte,
        copy_hash(disk_entry->hash, lte->hash);
 }
 
-int
-write_lookup_table_from_stream_list(struct list_head *stream_list,
-                                   int out_fd,
-                                   struct resource_entry *out_res_entry)
+static int
+write_wim_lookup_table_from_stream_list(struct list_head *stream_list,
+                                       struct filedes *out_fd,
+                                       struct resource_entry *out_res_entry,
+                                       int write_resource_flags)
 {
-       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;
-
-       start_offset = filedes_offset(out_fd);
-       if (start_offset == -1)
-               goto write_error;
+       struct wim_lookup_table_entry_disk *table_buf;
+       struct wim_lookup_table_entry_disk *table_buf_ptr;
+       int ret;
 
        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++;
-       }
-       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;
+       list_for_each_entry(lte, stream_list, lookup_table_list)
+               table_size += sizeof(struct wim_lookup_table_entry_disk);
+
+       DEBUG("Writing WIM lookup table (size=%zu, offset=%"PRIu64")",
+             table_size, out_fd->offset);
+
+       table_buf = MALLOC(table_size);
+       if (!table_buf) {
+               ERROR("Failed to allocate %zu bytes for temporary lookup table",
+                     table_size);
+               return WIMLIB_ERR_NOMEM;
        }
-       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:
+       table_buf_ptr = table_buf;
+       list_for_each_entry(lte, stream_list, lookup_table_list)
+               write_wim_lookup_table_entry(lte, table_buf_ptr++);
+
+       /* Write the lookup table uncompressed.  Although wimlib can handle a
+        * compressed lookup table, MS software cannot.  */
+       ret = write_wim_resource_from_buffer(table_buf,
+                                            table_size,
+                                            WIM_RESHDR_FLAG_METADATA,
+                                            out_fd,
+                                            WIMLIB_COMPRESSION_TYPE_NONE,
+                                            out_res_entry,
+                                            NULL,
+                                            write_resource_flags);
+       FREE(table_buf);
        return ret;
-write_error:
-       ERROR_WITH_ERRNO("Failed to write lookup table");
-       ret = WIMLIB_ERR_WRITE;
-       goto out;
 }
 
 static int
@@ -637,38 +717,65 @@ append_lookup_table_entry(struct wim_lookup_table_entry *lte, void *_list)
        return 0;
 }
 
-/* Writes the WIM lookup table to the output file. */
 int
-write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry)
+write_wim_lookup_table(WIMStruct *wim, int image, int write_flags,
+                      struct resource_entry *out_res_entry,
+                      struct list_head *stream_list_override)
 {
-       LIST_HEAD(stream_list);
-       int start_image;
-       int end_image;
+       int write_resource_flags;
+       struct list_head _stream_list;
+       struct list_head *stream_list;
 
-       if (image == WIMLIB_ALL_IMAGES) {
-               start_image = 1;
-               end_image = w->hdr.image_count;
+       if (stream_list_override) {
+               stream_list = stream_list_override;
        } else {
-               start_image = image;
-               end_image = image;
+               stream_list = &_stream_list;
+               INIT_LIST_HEAD(stream_list);
        }
 
-       for (int i = start_image; i <= end_image; i++) {
-               struct wim_lookup_table_entry *metadata_lte;
+       if (!(write_flags & WIMLIB_WRITE_FLAG_NO_METADATA)) {
+               int start_image;
+               int end_image;
+
+               if (image == WIMLIB_ALL_IMAGES) {
+                       start_image = 1;
+                       end_image = wim->hdr.image_count;
+               } else {
+                       start_image = image;
+                       end_image = image;
+               }
+
+               /* Push metadata resource lookup table entries onto the front of
+                * the list in reverse order, so that they're written in order.
+                */
+               for (int i = end_image; i >= start_image; i--) {
+                       struct wim_lookup_table_entry *metadata_lte;
+
+                       metadata_lte = wim->image_metadata[i - 1]->metadata_lte;
+                       metadata_lte->out_refcnt = 1;
+                       metadata_lte->part_number = wim->hdr.part_number;
+                       metadata_lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
+
+                       list_add(&metadata_lte->lookup_table_list, stream_list);
+               }
+       }
 
-               metadata_lte = w->image_metadata[i - 1]->metadata_lte;
-               metadata_lte->out_refcnt = 1;
-               metadata_lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
-               append_lookup_table_entry(metadata_lte, &stream_list);
+       /* Append additional lookup table entries that have out_refcnt != 0.  */
+       if (!stream_list_override) {
+               for_lookup_table_entry(wim->lookup_table,
+                                      append_lookup_table_entry, stream_list);
        }
-       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);
+
+       write_resource_flags = 0;
+       if (write_flags & WIMLIB_WRITE_FLAG_PIPABLE)
+               write_resource_flags |= WIMLIB_WRITE_RESOURCE_FLAG_PIPABLE;
+       return write_wim_lookup_table_from_stream_list(stream_list,
+                                                      &wim->out_fd,
+                                                      out_res_entry,
+                                                      write_resource_flags);
 }
 
+
 int
 lte_zero_real_refcnt(struct wim_lookup_table_entry *lte, void *_ignore)
 {
@@ -740,11 +847,9 @@ print_lookup_table_entry(const struct wim_lookup_table_entry *lte, FILE *out)
                }
                break;
 #ifdef __WIN32__
-       case RESOURCE_WIN32:
        case RESOURCE_WIN32_ENCRYPTED:
-#else
-       case RESOURCE_IN_FILE_ON_DISK:
 #endif
+       case RESOURCE_IN_FILE_ON_DISK:
                tfprintf(out, T("File on Disk      = `%"TS"'\n"),
                         lte->file_on_disk);
                break;
@@ -760,6 +865,59 @@ 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);
+}
+
+/* API function documented in wimlib.h  */
+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)
 {
@@ -767,9 +925,7 @@ do_print_lookup_table_entry(struct wim_lookup_table_entry *lte, void *fp)
        return 0;
 }
 
-/*
- * Prints the lookup table of a WIM file.
- */
+/* API function documented in wimlib.h  */
 WIMLIBAPI void
 wimlib_print_lookup_table(WIMStruct *wim)
 {
@@ -807,7 +963,7 @@ __lookup_resource(const struct wim_lookup_table *table, const u8 hash[])
  * This is only for pre-resolved inodes.
  */
 int
-lookup_resource(WIMStruct *w,
+lookup_resource(WIMStruct *wim,
                const tchar *path,
                int lookup_flags,
                struct wim_dentry **dentry_ret,
@@ -829,7 +985,7 @@ lookup_resource(WIMStruct *w,
                }
        }
 
-       dentry = get_dentry(w, path);
+       dentry = get_dentry(wim, path);
        if (p)
                *p = T(':');
        if (!dentry)
@@ -837,7 +993,9 @@ lookup_resource(WIMStruct *w,
 
        inode = dentry->d_inode;
 
-       wimlib_assert(inode->i_resolved);
+       if (!inode->i_resolved)
+               if (inode_resolve_ltes(inode, wim->lookup_table, false))
+                       return -EIO;
 
        if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK)
              && inode_is_directory(inode))
@@ -871,45 +1029,84 @@ out:
 #endif
 
 /*
- * XXX Probably should store the compression type directly in the lookup table
- * entry
- */
-int
-wim_resource_compression_type(const struct wim_lookup_table_entry *lte)
-{
-       if (!(lte->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
-           || lte->resource_location != RESOURCE_IN_WIM)
-               return WIMLIB_COMPRESSION_TYPE_NONE;
-       return wimlib_get_compression_type(lte->wim);
-}
-
-/* Resolve an inode's lookup table entries
+ * Resolve an inode's lookup table entries.
  *
  * This replaces the SHA1 hash fields (which are used to lookup an entry in the
- * lookup table) with pointers directly to the lookup table entries.  A circular
- * linked list of streams sharing the same lookup table entry is created.
+ * lookup table) with pointers directly to the lookup table entries.
  *
- * This function always succeeds; unresolved lookup table entries are given a
- * NULL pointer.
+ * If @force is %false:
+ *     If any needed SHA1 message digests are not found in the lookup table,
+ *     WIMLIB_ERR_RESOURCE_NOT_FOUND is returned and the inode is left
+ *     unmodified.
+ * If @force is %true:
+ *     If any needed SHA1 message digests are not found in the lookup table,
+ *     new entries are allocated and inserted into the lookup table.
  */
-void
-inode_resolve_ltes(struct wim_inode *inode, struct wim_lookup_table *table)
+int
+inode_resolve_ltes(struct wim_inode *inode, struct wim_lookup_table *table,
+                  bool force)
 {
+       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 (!lte) {
+                               if (force) {
+                                       lte = new_lookup_table_entry();
+                                       if (!lte)
+                                               return WIMLIB_ERR_NOMEM;
+                                       copy_hash(lte->hash, hash);
+                                       lookup_table_insert(table, lte);
+                               } else {
+                                       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 (!ads_lte) {
+                                       if (force) {
+                                               ads_lte = new_lookup_table_entry();
+                                               if (!ads_lte)
+                                                       return WIMLIB_ERR_NOMEM;
+                                               copy_hash(ads_lte->hash, hash);
+                                               lookup_table_insert(table, ads_lte);
+                                       } else {
+                                               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
@@ -1093,4 +1290,3 @@ hash_unhashed_stream(struct wim_lookup_table_entry *lte,
                *lte_ret = lte;
        return 0;
 }
-