* image_metadata array).
*/
int
-read_lookup_table(WIMStruct *w)
+read_lookup_table(WIMStruct *wim)
{
int ret;
size_t num_entries;
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);
+ wim->hdr.lookup_table_res_entry.offset,
+ wim->hdr.lookup_table_res_entry.original_size);
- if (resource_is_compressed(&w->hdr.lookup_table_res_entry)) {
+ if (resource_is_compressed(&wim->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.size /
+ num_entries = wim->hdr.lookup_table_res_entry.size /
sizeof(struct wim_lookup_table_entry_disk);
table = new_lookup_table(num_entries * 2 + 1);
if (!table) {
return WIMLIB_ERR_NOMEM;
}
- w->current_image = 0;
- offset = w->hdr.lookup_table_res_entry.offset;
+ wim->current_image = 0;
+ offset = wim->hdr.lookup_table_res_entry.offset;
buf_entries_remaining = 0;
for (; num_entries != 0;
num_entries--, buf_entries_remaining--, disk_entry++)
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,
+ if (full_pread(wim->in_fd, table_buf,
bytes_to_read, offset) != bytes_to_read)
{
ERROR_WITH_ERRNO("Error reading lookup table "
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);
- if (cur_entry->part_number != w->hdr.part_number) {
+ if (cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
+ cur_entry->compression_type = wim->compression_type;
+ else
+ BUILD_BUG_ON(WIMLIB_COMPRESSION_TYPE_NONE != 0);
+
+ 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;
}
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;
}
* 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 */
}
}
- 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;
out_free_cur_entry:
out_free_lookup_table:
free_lookup_table(table);
out:
- w->current_image = 0;
+ wim->current_image = 0;
return ret;
}
/* Writes the WIM lookup table to the output file. */
int
-write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry)
+write_lookup_table(WIMStruct *wim, int image, struct resource_entry *out_res_entry)
{
LIST_HEAD(stream_list);
int start_image;
if (image == WIMLIB_ALL_IMAGES) {
start_image = 1;
- end_image = w->hdr.image_count;
+ end_image = wim->hdr.image_count;
} else {
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 = wim->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);
}
- for_lookup_table_entry(w->lookup_table,
+ for_lookup_table_entry(wim->lookup_table,
append_lookup_table_entry,
&stream_list);
return write_lookup_table_from_stream_list(&stream_list,
- w->out_fd,
+ wim->out_fd,
out_res_entry);
}
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)
{
}
/*
- * Prints the lookup table of a WIM file.
+ * Deprecated
*/
WIMLIBAPI void
wimlib_print_lookup_table(WIMStruct *wim)
* 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,
}
}
- dentry = get_dentry(w, path);
+ dentry = get_dentry(wim, path);
if (p)
*p = T(':');
if (!dentry)
inode = dentry->d_inode;
if (!inode->i_resolved)
- if (inode_resolve_ltes(inode, w->lookup_table))
+ if (inode_resolve_ltes(inode, wim->lookup_table))
return -EIO;
if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK)
}
#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
*
* This replaces the SHA1 hash fields (which are used to lookup an entry in the
*lte_ret = lte;
return 0;
}
-