#include "lookup_table.h"
/*
- * Reads the metadata metadata resource from the WIM file. The metadata
+ * Reads a metadata resource for an image in the WIM file. The metadata
* resource consists of the security data, followed by the directory entry for
* the root directory, followed by all the other directory entries in the
* filesystem. The subdir_offset field of each directory entry gives the start
* end-of-directory is signaled by a directory entry of length '0', really of
* length 8, because that's how long the 'length' field is.
*
- * @fp: The FILE* for the input WIM file.
- * @wim_ctype: The compression type of the WIM file.
- * @imd: Pointer to the image metadata structure. Its `metadata_lte'
- * member specifies the lookup table entry for the metadata
- * resource. The rest of the image metadata entry will be filled
- * in by this function.
+ * @w: Pointer to the WIMStruct for the WIM file.
*
- * @return: Zero on success, nonzero on failure.
+ * @imd: Pointer to the image metadata structure for the image whose
+ * metadata resource we are reading. Its `metadata_lte' member
+ * specifies the lookup table entry for the metadata resource. The
+ * rest of the image metadata entry will be filled in by this
+ * function.
+ *
+ * Returns: Zero on success, nonzero on failure.
*/
int
read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)
struct wim_dentry *dentry;
const struct wim_lookup_table_entry *metadata_lte;
u64 metadata_len;
- struct hlist_head inode_list;
metadata_lte = imd->metadata_lte;
metadata_len = wim_resource_size(metadata_lte);
- DEBUG("Reading metadata resource: length = %"PRIu64", "
- "offset = %"PRIu64"", metadata_len,
+ DEBUG("Reading metadata resource: original_size = %"PRIu64", "
+ "size = %"PRIu64", offset = %"PRIu64"",
+ metadata_lte->resource_entry.original_size,
+ metadata_lte->resource_entry.size,
metadata_lte->resource_entry.offset);
/* There is no way the metadata resource could possibly be less than (8
}
/* Read the metadata resource into memory. (It may be compressed.) */
- ret = read_full_resource_into_buf(metadata_lte, buf, false);
+ ret = read_full_resource_into_buf(metadata_lte, buf);
if (ret)
goto out_free_buf;
wimlib_assert(imd->security_data == NULL);
ret = read_security_data(buf, metadata_len, &imd->security_data);
- if (ret != 0)
+ if (ret)
goto out_free_buf;
dentry_offset = (imd->security_data->total_length + 7) & ~7;
/* Now read the entire directory entry tree into memory. */
DEBUG("Reading dentry tree");
ret = read_dentry_tree(buf, metadata_len, dentry);
- if (ret != 0)
- goto out_free_dentry_tree;
-
- /* Calculate the full paths in the dentry tree. */
- DEBUG("Calculating dentry full paths");
- ret = for_dentry_in_tree(dentry, calculate_dentry_full_path, NULL);
- if (ret != 0)
+ if (ret)
goto out_free_dentry_tree;
/* Build hash table that maps hard link group IDs to dentry sets */
- ret = dentry_tree_fix_inodes(dentry, &inode_list);
- if (ret != 0)
+ ret = dentry_tree_fix_inodes(dentry, &imd->inode_list);
+ if (ret)
goto out_free_dentry_tree;
if (!w->all_images_verified) {
DEBUG("Running miscellaneous verifications on the dentry tree");
for_lookup_table_entry(w->lookup_table, lte_zero_real_refcnt, NULL);
ret = for_dentry_in_tree(dentry, verify_dentry, w);
- if (ret != 0)
+ if (ret)
goto out_free_dentry_tree;
}
DEBUG("Done reading image metadata");
imd->root_dentry = dentry;
- imd->inode_list = inode_list;
- if (imd->inode_list.first)
- imd->inode_list.first->pprev = &imd->inode_list.first;
+ INIT_LIST_HEAD(&imd->unhashed_streams);
goto out_free_buf;
out_free_dentry_tree:
free_dentry_tree(dentry, NULL);
* uncompressed data rather a lookup table entry; also writes the SHA1 hash of
* the buffer to @hash. */
static int
-write_wim_resource_from_buffer(const u8 *buf, u64 buf_size,
- FILE *out_fp, int out_ctype,
+write_wim_resource_from_buffer(const void *buf, size_t buf_size,
+ int out_fd, int out_ctype,
struct resource_entry *out_res_entry,
u8 hash[SHA1_HASH_SIZE])
{
* write_wim_resource(). */
struct wim_lookup_table_entry lte;
int ret;
- lte.resource_entry.original_size = buf_size;
lte.resource_location = RESOURCE_IN_ATTACHED_BUFFER;
lte.attached_buffer = (void*)buf;
- zero_out_hash(lte.hash);
- ret = write_wim_resource(<e, out_fp, out_ctype, out_res_entry, 0);
- if (ret)
- return ret;
- copy_hash(hash, lte.hash);
- return 0;
+ lte.resource_entry.original_size = buf_size;
+ lte.resource_entry.flags = 0;
+ lte.unhashed = 1;
+ ret = write_wim_resource(<e, out_fd, out_ctype, out_res_entry, 0);
+ if (ret == 0)
+ copy_hash(hash, lte.hash);
+ return ret;
}
/* Write the metadata resource for the current WIM image. */
u64 metadata_original_size;
struct wim_security_data *sd;
- wimlib_assert(w->out_fp != NULL);
+ wimlib_assert(w->out_fd != -1);
wimlib_assert(w->current_image != WIMLIB_NO_IMAGE);
DEBUG("Writing metadata resource for image %d (offset = %"PRIu64")",
- w->current_image, ftello(w->out_fp));
+ w->current_image, filedes_offset(w->out_fd));
root = wim_root_dentry(w);
/* Get the lookup table entry for the metadata resource so we can update
* it. */
- lte = w->image_metadata[w->current_image - 1].metadata_lte;
+ lte = wim_get_current_image_metadata(w)->metadata_lte;
/* Write the metadata resource to the output WIM using the proper
* compression type. The lookup table entry for the metadata resource
* is updated. */
ret = write_wim_resource_from_buffer(buf, metadata_original_size,
- w->out_fp,
+ w->out_fd,
wimlib_get_compression_type(w),
<e->output_resource_entry,
lte->hash);
- if (ret)
- goto out_free_buf;
-
/* Note that although the SHA1 message digest of the metadata resource
* is very likely to have changed, the corresponding lookup table entry
* is not actually located in the hash table, so it need not be
* re-inserted in the hash table. */
- lte->out_refcnt = 1;
- lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
-out_free_buf:
+
/* All the data has been written to the new WIM; no need for the buffer
* anymore */
FREE(buf);
git://wimlib.net / wimlib / blobdiff