# include "config.h"
#endif
+#include <libxml/encoding.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlwriter.h>
+#include <string.h>
+
+#include "wimlib/assert.h"
+#include "wimlib/blob_table.h"
#include "wimlib/dentry.h"
#include "wimlib/encoding.h"
#include "wimlib/error.h"
#include "wimlib/file_io.h"
-#include "wimlib/lookup_table.h"
#include "wimlib/metadata.h"
#include "wimlib/resource.h"
#include "wimlib/timestamp.h"
#include "wimlib/xml.h"
#include "wimlib/write.h"
-#include <libxml/encoding.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xmlwriter.h>
-#include <limits.h>
-#include <string.h>
-#include <unistd.h>
-
/* Structures used to form an in-memory representation of the XML data (other
* than the raw parse tree from libxml). */
bool wimboot;
/* Note: must update clone_image_info() if adding new fields here */
-
- struct wim_lookup_table *lookup_table; /* temporary field */
};
/* A struct wim_info structure corresponds to the entire XML data for a WIM file. */
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
index_prop = xmlGetProp(image_node, "INDEX");
if (index_prop) {
image_info->index = atoi(index_prop);
- FREE(index_prop);
+ xmlFree(index_prop);
} else {
image_info->index = 1;
}
/* 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 *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 wim_lookup_table_entry *lte;
-
- lte = inode_unnamed_lte(inode, info->lookup_table);
- if (lte) {
- info->total_bytes += lte->size;
- if (!dentry_is_first_in_inode(dentry))
- info->hard_link_bytes += lte->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_ads; i++) {
- if (inode->i_ads_entries[i].stream_name_nbytes) {
- lte = inode_stream_lte(inode, i + 1, info->lookup_table);
- if (lte) {
- info->hard_link_bytes += inode->i_nlink *
- lte->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 <FILECOUNT>, <DIRCOUNT>, <TOTALBYTES>, and
- * <HARDLINKBYTES> elements of each <IMAGE>.
+ * <HARDLINKBYTES> 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->lookup_table = wim->lookup_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 = get_wim_timestamp();
+ info->last_modification_time = now_as_wim_timestamp();
}
/* Adds an image to the XML information. */
wim->wim_info = wim_info;
image_info->index = wim_info->num_images;
- image_info->creation_time = get_wim_timestamp();
+ image_info->creation_time = now_as_wim_timestamp();
xml_update_image_info(wim, image_info->index);
return 0;
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)
* compressed XML data, MS software cannot. */
ret = write_wim_resource_from_buffer(xml_data,
xml_len,
- WIM_RESHDR_FLAG_METADATA,
+ true,
&wim->out_fd,
WIMLIB_COMPRESSION_TYPE_NONE,
0,
NULL,
write_resource_flags);
FREE(xml_data);
- DEBUG("ret=%d", ret);
return ret;
}
const struct wim_reshdr *xml_reshdr;
if (wim->filename == NULL && filedes_is_seekable(&wim->in_fd))
- return WIMLIB_ERR_INVALID_PARAM;
+ return WIMLIB_ERR_NO_FILENAME;
if (buf_ret == NULL || bufsize_ret == NULL)
return WIMLIB_ERR_INVALID_PARAM;
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);
}