*/
/*
- * Copyright (C) 2012, 2013 Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
*
* @return: Zero on success, nonzero on failure.
*/
-int read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)
+int
+read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)
{
u8 *buf;
u32 dentry_offset;
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);
}
/* Read the metadata resource into memory. (It may be compressed.) */
- ret = read_full_wim_resource(metadata_lte, buf, 0);
- if (ret != 0)
+ ret = read_full_resource_into_buf(metadata_lte, buf, false);
+ if (ret)
goto out_free_buf;
DEBUG("Finished reading metadata resource into memory.");
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);
return ret;
}
-static void recalculate_security_data_length(struct wim_security_data *sd)
+static void
+recalculate_security_data_length(struct wim_security_data *sd)
{
u32 total_length = sizeof(u64) * sd->num_entries + 2 * sizeof(u32);
for (u32 i = 0; i < sd->num_entries; i++)
/* Like write_wim_resource(), but the resource is specified by a buffer of
* 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,
- struct resource_entry *out_res_entry,
- u8 hash[SHA1_HASH_SIZE])
+static int
+write_wim_resource_from_buffer(const void *buf, u64 buf_size,
+ FILE *out_fp, int out_ctype,
+ struct resource_entry *out_res_entry,
+ u8 hash[SHA1_HASH_SIZE])
{
/* Set up a temporary lookup table entry to provide to
* write_wim_resource(). */
struct wim_lookup_table_entry lte;
int ret;
- lte.resource_entry.flags = 0;
- lte.resource_entry.original_size = buf_size;
- lte.resource_entry.size = buf_size;
- lte.resource_entry.offset = 0;
lte.resource_location = RESOURCE_IN_ATTACHED_BUFFER;
- lte.attached_buffer = (u8*)buf;
-
- zero_out_hash(lte.hash);
+ lte.attached_buffer = (void*)buf;
+ lte.resource_entry.original_size = buf_size;
+ lte.resource_entry.flags = 0;
+ lte.unhashed = 1;
ret = write_wim_resource(<e, out_fp, out_ctype, out_res_entry, 0);
- if (ret != 0)
- return ret;
- copy_hash(hash, lte.hash);
- return 0;
+ if (ret == 0)
+ copy_hash(hash, lte.hash);
+ return ret;
}
/* Write the metadata resource for the current WIM image. */
-int write_metadata_resource(WIMStruct *w)
+int
+write_metadata_resource(WIMStruct *w)
{
u8 *buf;
u8 *p;
u64 metadata_original_size;
struct wim_security_data *sd;
+ wimlib_assert(w->out_fp != NULL);
+ wimlib_assert(w->current_image != WIMLIB_NO_IMAGE);
+
DEBUG("Writing metadata resource for image %d (offset = %"PRIu64")",
w->current_image, ftello(w->out_fp));
+
root = wim_root_dentry(w);
sd = wim_security_data(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
wimlib_get_compression_type(w),
<e->output_resource_entry,
lte->hash);
- if (ret != 0)
- goto out;
+ if (ret)
+ goto out_free_buf;
- /* It's very likely the SHA1 message digest of the metadata resource
- * changed, so re-insert the lookup table entry into the lookup table.
- *
- * We do not check for other lookup table entries having the same SHA1
- * message digest. It's possible for 2 absolutely identical images to
- * be added, therefore causing 2 identical metadata resources to be in
- * the WIM. However, in this case, it's expected for 2 separate lookup
- * table entries to be created, even though this doesn't make a whole
- * lot of sense since they will share the same SHA1 message digest.
- * */
- lookup_table_unlink(w->lookup_table, lte);
- lookup_table_insert(w->lookup_table, lte);
+ /* 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;
-
- /* Make sure that the lookup table entry for this metadata resource is
- * marked with the metadata flag. */
lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
-out:
+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