X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmetadata_resource.c;h=2f7dfeb6e729ce0ae3dd4c0f7a59ca05f9f96e49;hb=18b97ba5b37c0134513886062946d0fd521a9b5e;hp=9cebf9ebc0c1be10daa386aa0fbd16c4565d6f9c;hpb=f3e97b29c4a8c564d54b0fd11cd43a9b4cd6a8ad;p=wimlib

diff --git a/src/metadata_resource.c b/src/metadata_resource.c
index 9cebf9eb..2f7dfeb6 100644
--- a/src/metadata_resource.c
+++ b/src/metadata_resource.c
@@ -25,7 +25,7 @@
 #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
@@ -33,14 +33,15 @@
  * 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)
@@ -87,7 +88,7 @@ read_metadata_resource(WIMStruct *w, struct wim_image_metadata *imd)
 	}
 
 	/* 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;
 
@@ -192,8 +193,8 @@ 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 void *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])
 {
@@ -206,7 +207,7 @@ write_wim_resource_from_buffer(const void *buf, u64 buf_size,
 	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);
+	ret = write_wim_resource(&lte, out_fd, out_ctype, out_res_entry, 0);
 	if (ret == 0)
 		copy_hash(hash, lte.hash);
 	return ret;
@@ -224,16 +225,26 @@ write_metadata_resource(WIMStruct *w)
 	struct wim_lookup_table_entry *lte;
 	u64 metadata_original_size;
 	struct wim_security_data *sd;
+	struct wim_image_metadata *imd;
 
-	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));
+
+	imd = w->image_metadata[w->current_image - 1];
 
+	root = imd->root_dentry;
+	sd = imd->security_data;
 
-	root = wim_root_dentry(w);
-	sd = wim_security_data(w);
+	if (!root) {
+		/* Empty image; create a dummy root. */
+		ret = new_filler_directory(T(""), &root);
+		if (ret)
+			return ret;
+		imd->root_dentry = root;
+	}
 
 	/* Offset of first child of the root dentry.  It's equal to:
 	 * - The total length of the security data, rounded to the next 8-byte
@@ -278,7 +289,7 @@ write_metadata_resource(WIMStruct *w)
 	 * 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),
 					     &lte->output_resource_entry,
 					     lte->hash);