X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fxml.c;h=c71debbf74cbea6b7066f6dd3b6de145a3f38b71;hb=2fed42ae0eee69e6352425c29ca2b12af99f8992;hp=279c3382366a7676471c73ed1ded936ed6b8606a;hpb=8846dc57c638e837f38cd28dcd41f71e83d648c2;p=wimlib diff --git a/src/xml.c b/src/xml.c index 279c3382..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 @@ -896,15 +900,16 @@ xml_write_time(xmlTextWriter *writer, const char *element_name, u64 time) /* Writes an 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; @@ -1075,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); @@ -1128,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]); @@ -1162,107 +1164,56 @@ 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 *arg) +static u64 +inode_sum_stream_sizes(const struct wim_inode *inode, + const struct blob_table *blob_table) { - struct image_info *info = arg; - const struct wim_inode *inode = dentry->d_inode; - - /* Update directory count and file count. - * - * Each dentry counts as either a file or a directory, but not both. - * The root directory is an exception: it is not counted at all. - * - * Symbolic links and junction points (and presumably other reparse - * points) count as regular files. This is despite the fact that - * junction points have FILE_ATTRIBUTE_DIRECTORY set. - */ - - if (!dentry_is_root(dentry)) { - if (inode_is_directory(inode)) - info->dir_count++; - else - info->file_count++; - } + u64 total_size = 0; - /* - * Update total bytes and hard link bytes. - * - * We try to act the same as the MS implementation, even though there - * are some inconsistencies/bugs in the way it operates. - * - * If there are no alternate data streams in the image, the "total - * bytes" is the sum of the size of the un-named data stream of each - * inode times the link count of that inode. In other words, it would - * be the total number of bytes of regular files you would have if you - * extracted the full image without any hard-links. The "hard link - * bytes" is equal to the "total bytes" minus the size of the un-named - * data stream of each inode. In other words, the "hard link bytes" - * counts the size of the un-named data stream for all the links to each - * inode except the first one. - * - * Reparse points and directories don't seem to be counted in either the - * total bytes or the hard link bytes. - * - * And now we get to the most confusing part, the alternate data - * streams. They are not counted in the "total bytes". However, if the - * link count of an inode with alternate data streams is 2 or greater, - * the size of all the alternate data streams is included in the "hard - * link bytes", and this size is multiplied by the link count (NOT one - * less than the link count). - */ - if (!(inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY | - FILE_ATTRIBUTE_REPARSE_POINT))) - { - struct blob_descriptor *blob; - - blob = inode_get_blob_for_unnamed_data_stream(inode, - info->blob_table); - if (blob) { - info->total_bytes += blob->size; - if (!dentry_is_first_in_inode(dentry)) - info->hard_link_bytes += blob->size; - } + for (unsigned i = 0; i < inode->i_num_streams; i++) { + const struct blob_descriptor *blob; - if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) { - for (unsigned i = 0; i < inode->i_num_streams; i++) { - if (stream_is_named_data_stream(&inode->i_streams[i])) { - blob = stream_blob(&inode->i_streams[i], - info->blob_table); - if (blob) { - info->hard_link_bytes += inode->i_nlink * - blob->size; - } - } - } - } + blob = stream_blob(&inode->i_streams[i], blob_table); + if (blob) + total_size += blob->size; } - return 0; + return total_size; } /* * Calculate what to put in the , , , and * elements of the specified WIM image. + * + * Note: since these stats are likely to be used for display purposes only, we + * no longer attempt to duplicate WIMGAPI's weird bugs when calculating them. */ void xml_update_image_info(WIMStruct *wim, int image) { - struct image_info *image_info; + struct image_info *info; + struct wim_image_metadata *imd; + struct wim_inode *inode; + u64 size; - DEBUG("Updating the image info for image %d", image); + info = &wim->wim_info->images[image - 1]; + imd = wim->image_metadata[image - 1]; - image_info = &wim->wim_info->images[image - 1]; + info->file_count = 0; + info->dir_count = 0; + info->total_bytes = 0; + info->hard_link_bytes = 0; - 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; + 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. */ @@ -1428,7 +1379,6 @@ prepare_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes, xmlOutputBuffer *outbuf; xmlTextWriter *writer; int ret; - int first, last; const xmlChar *content; int len; u8 *xml_data; @@ -1490,20 +1440,23 @@ prepare_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes, } 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); @@ -1550,7 +1503,6 @@ out_output_buffer_close: out_buffer_free: xmlBufferFree(buf); out: - DEBUG("ret=%d", ret); return ret; out_write_error: @@ -1569,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) @@ -1589,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; } @@ -1638,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); }