X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmetadata_resource.c;h=91b1121f92ef7efc7b346e68ae3e5d4cd7c656c6;hp=9b5a83050abd51a95a6d47ebc791ce63d2c5d5fd;hb=062465170ddb4520ca6fbc64a0f6e27e786de101;hpb=9e2571b03cd9c71d11b3dad9ea5dcfa43f50deb4

diff --git a/src/metadata_resource.c b/src/metadata_resource.c
index 9b5a8305..91b1121f 100644
--- a/src/metadata_resource.c
+++ b/src/metadata_resource.c
@@ -51,7 +51,6 @@ 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);
@@ -105,7 +104,7 @@ read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)
 
 	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;
@@ -147,34 +146,26 @@ read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)
 	/* 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);
@@ -199,7 +190,7 @@ recalculate_security_data_length(struct wim_security_data *sd)
  * 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,
+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])
@@ -208,15 +199,15 @@ write_wim_resource_from_buffer(const u8 *buf, u64 buf_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);
+	lte.resource_entry.original_size = buf_size;
+	lte.resource_entry.flags         = 0;
+	lte.unhashed                     = 1;
 	ret = write_wim_resource(&lte, out_fp, out_ctype, out_res_entry, 0);
-	if (ret)
-		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. */
@@ -279,7 +270,7 @@ write_metadata_resource(WIMStruct *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