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. */
/* Writes an <IMAGE> element to the XML document. */
static int
-xml_write_image_info(xmlTextWriter *writer, const struct image_info *image_info)
+xml_write_image_info(xmlTextWriter *writer, const struct image_info *image_info,
+ int index)
{
int rc;
+
rc = xmlTextWriterStartElement(writer, "IMAGE");
if (rc < 0)
return rc;
- rc = xmlTextWriterWriteFormatAttribute(writer, "INDEX", "%d",
- image_info->index);
+ rc = xmlTextWriterWriteFormatAttribute(writer, "INDEX", "%d", index);
if (rc < 0)
return rc;
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);
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]);
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;
}
/*
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. */
xmlOutputBuffer *outbuf;
xmlTextWriter *writer;
int ret;
- int first, last;
const xmlChar *content;
int len;
u8 *xml_data;
}
if (image == WIMLIB_ALL_IMAGES) {
- first = 1;
- last = wim->hdr.image_count;
- } else {
- first = image;
- last = image;
- }
-
- for (int i = first; i <= last; i++) {
- ret = xml_write_image_info(writer, &wim->wim_info->images[i - 1]);
- if (ret) {
+ for (int i = 0; i < wim->hdr.image_count; i++) {
+ ret = xml_write_image_info(writer,
+ &wim->wim_info->images[i],
+ i + 1);
if (ret < 0)
goto out_write_error;
- goto out_free_text_writer;
+ if (ret > 0)
+ goto out_free_text_writer;
}
+ } else {
+ ret = xml_write_image_info(writer,
+ &wim->wim_info->images[image - 1],
+ 1);
+ if (ret < 0)
+ goto out_write_error;
+ if (ret > 0)
+ goto out_free_text_writer;
}
ret = xmlTextWriterEndElement(writer);
out_buffer_free:
xmlBufferFree(buf);
out:
- DEBUG("ret=%d", ret);
return ret;
out_write_error:
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)
NULL,
write_resource_flags);
FREE(xml_data);
- DEBUG("ret=%d", ret);
return 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);
}