X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=inline;f=src%2Fxml.c;h=c71debbf74cbea6b7066f6dd3b6de145a3f38b71;hb=80c2fe3e6463cfd0eca5bead23a08731b6db9576;hp=0fb6472342d43c8396eea152087bc76107939595;hpb=3bacb68ef66294a0bf2898939a8c1578728af0f3;p=wimlib

diff --git a/src/xml.c b/src/xml.c
index 0fb64723..c71debbf 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -89,8 +89,6 @@ struct image_info {
 	bool wimboot;
 
 	/* Note: must update clone_image_info() if adding new fields here  */
-
-	struct blob_table *blob_table; /* temporary field */
 };
 
 /* A struct wim_info structure corresponds to the entire XML data for a WIM file. */
@@ -180,6 +178,12 @@ wim_info_get_wimboot(const struct wim_info *info, int image)
 	return info->images[image - 1].wimboot;
 }
 
+u64
+wim_info_get_windows_build_number(const struct wim_info *info, int image)
+{
+	return info->images[image - 1].windows_info.windows_version.build;
+}
+
 /* Architecture constants are from w64 mingw winnt.h  */
 #define PROCESSOR_ARCHITECTURE_INTEL 0
 #define PROCESSOR_ARCHITECTURE_MIPS 1
@@ -1076,8 +1080,6 @@ xml_export_image(const struct wim_info *old_wim_info,
 	struct image_info *image_info;
 	int ret;
 
-	DEBUG("Copying XML data between WIM files for source image %d.", image);
-
 	wimlib_assert(old_wim_info != NULL);
 	wimlib_assert(image >= 1 && image <= old_wim_info->num_images);
 
@@ -1129,7 +1131,6 @@ xml_delete_image(struct wim_info **wim_info_p, int image)
 
 	wim_info = *wim_info_p;
 	wimlib_assert(image >= 1 && image <= wim_info->num_images);
-	DEBUG("Deleting image %d from the XML data.", image);
 
 	destroy_image_info(&wim_info->images[image - 1]);
 
@@ -1163,28 +1164,20 @@ xml_set_memory_allocator(void *(*malloc_func)(size_t),
 	xmlMemSetup(free_func, malloc_func, realloc_func, STRDUP);
 }
 
-static int
-calculate_dentry_statistics(struct wim_dentry *dentry, void *_info)
+static u64
+inode_sum_stream_sizes(const struct wim_inode *inode,
+		       const struct blob_table *blob_table)
 {
-	struct image_info *info = _info;
-	const struct wim_inode *inode = dentry->d_inode;
-
-	if (inode_is_directory(inode))
-		info->dir_count++;
-	else
-		info->file_count++;
+	u64 total_size = 0;
 
 	for (unsigned i = 0; i < inode->i_num_streams; i++) {
 		const struct blob_descriptor *blob;
 
-		blob = stream_blob(&inode->i_streams[i], info->blob_table);
-		if (!blob)
-			continue;
-		info->total_bytes += blob->size;
-		if (!dentry_is_first_in_inode(dentry))
-			info->hard_link_bytes += blob->size;
+		blob = stream_blob(&inode->i_streams[i], blob_table);
+		if (blob)
+			total_size += blob->size;
 	}
-	return 0;
+	return total_size;
 }
 
 /*
@@ -1197,22 +1190,30 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *_info)
 void
 xml_update_image_info(WIMStruct *wim, int image)
 {
-	struct image_info *image_info;
-
-	DEBUG("Updating the image info for image %d", image);
-
-	image_info = &wim->wim_info->images[image - 1];
-
-	image_info->file_count      = 0;
-	image_info->dir_count       = 0;
-	image_info->total_bytes     = 0;
-	image_info->hard_link_bytes = 0;
-	image_info->blob_table = wim->blob_table;
+	struct image_info *info;
+	struct wim_image_metadata *imd;
+	struct wim_inode *inode;
+	u64 size;
+
+	info = &wim->wim_info->images[image - 1];
+	imd = wim->image_metadata[image - 1];
+
+	info->file_count = 0;
+	info->dir_count = 0;
+	info->total_bytes = 0;
+	info->hard_link_bytes = 0;
+
+	image_for_each_inode(inode, imd) {
+		if (inode_is_directory(inode))
+			info->dir_count += inode->i_nlink;
+		else
+			info->file_count += inode->i_nlink;
+		size = inode_sum_stream_sizes(inode, wim->blob_table);
+		info->total_bytes += size * inode->i_nlink;
+		info->hard_link_bytes += size * (inode->i_nlink - 1);
+	}
 
-	for_dentry_in_tree(wim->image_metadata[image - 1]->root_dentry,
-			   calculate_dentry_statistics,
-			   image_info);
-	image_info->last_modification_time = now_as_wim_timestamp();
+	info->last_modification_time = now_as_wim_timestamp();
 }
 
 /* Adds an image to the XML information. */
@@ -1502,7 +1503,6 @@ out_output_buffer_close:
 out_buffer_free:
 	xmlBufferFree(buf);
 out:
-	DEBUG("ret=%d", ret);
 	return ret;
 
 out_write_error:
@@ -1521,9 +1521,6 @@ write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes,
 	u8 *xml_data;
 	size_t xml_len;
 
-	DEBUG("Writing WIM XML data (image=%d, offset=%"PRIu64")",
-	      image, wim->out_fd.offset);
-
 	ret = prepare_wim_xml_data(wim, image, total_bytes,
 				   &xml_data, &xml_len);
 	if (ret)
@@ -1541,7 +1538,6 @@ write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes,
 					     NULL,
 					     write_resource_flags);
 	FREE(xml_data);
-	DEBUG("ret=%d", ret);
 	return ret;
 }
 
@@ -1590,7 +1586,6 @@ wimlib_get_xml_data(WIMStruct *wim, void **buf_ret, size_t *bufsize_ret)
 
 	xml_reshdr = &wim->hdr.xml_data_reshdr;
 
-	DEBUG("Reading XML data.");
 	*bufsize_ret = xml_reshdr->uncompressed_size;
 	return wim_reshdr_to_data(xml_reshdr, wim, buf_ret);
 }