X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fxml.c;h=d6c665575119f2080e50117f3e8685fb9eb6be7b;hp=8132671a29dd6313ef2a680ff0f69584661efeae;hb=e86f9f34e67c89123b747524d7e67dd70175d3d4;hpb=7c08b0b067f48e80226e6b5466fd95feb43139e6 diff --git a/src/xml.c b/src/xml.c index 8132671a..d6c66557 100644 --- a/src/xml.c +++ b/src/xml.c @@ -10,16 +10,16 @@ * This file is part of wimlib, a library for working with WIM files. * * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * A PARTICULAR PURPOSE. See the GNU General Public License for more * details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -27,6 +27,7 @@ #include "dentry.h" #include "xml.h" #include "timestamp.h" +#include "lookup_table.h" #include #include #include @@ -74,7 +75,10 @@ struct image_info { char *description; char *display_name; char *display_description; - char *flags; + union { + char *flags; + struct lookup_table *lookup_table; + }; }; @@ -205,10 +209,13 @@ static void destroy_windows_info(struct windows_info *windows_info) FREE(windows_info->product_name); FREE(windows_info->edition_id); FREE(windows_info->installation_type); + FREE(windows_info->hal); FREE(windows_info->product_type); + FREE(windows_info->product_suite); for (i = 0; i < windows_info->num_languages; i++) FREE(windows_info->languages[i]); FREE(windows_info->languages); + FREE(windows_info->default_language); FREE(windows_info->system_root); } @@ -239,7 +246,7 @@ void free_wim_info(struct wim_info *info) /* Reads the information from a element inside the element. * */ -static void xml_read_windows_version(const xmlNode *version_node, +static void xml_read_windows_version(const xmlNode *version_node, struct windows_version* windows_version) { xmlNode *child; @@ -261,8 +268,8 @@ static void xml_read_windows_version(const xmlNode *version_node, /* Reads the information from a element inside a element. * */ -static int xml_read_languages(const xmlNode *languages_node, - char ***languages_ret, +static int xml_read_languages(const xmlNode *languages_node, + char ***languages_ret, u64 *num_languages_ret, char **default_language_ret) { @@ -302,7 +309,7 @@ static int xml_read_languages(const xmlNode *languages_node, } /* Reads the information from a element inside an element. */ -static int xml_read_windows_info(const xmlNode *windows_node, +static int xml_read_windows_info(const xmlNode *windows_node, struct windows_info *windows_info) { xmlNode *child; @@ -314,27 +321,27 @@ static int xml_read_windows_info(const xmlNode *windows_node, if (node_name_is(child, "ARCH")) { windows_info->arch = node_get_u64(child); } else if (node_name_is(child, "PRODUCTNAME")) { - ret = node_get_string(child, + ret = node_get_string(child, &windows_info->product_name); } else if (node_name_is(child, "EDITIONID")) { - ret = node_get_string(child, + ret = node_get_string(child, &windows_info->edition_id); } else if (node_name_is(child, "INSTALLATIONTYPE")) { - ret = node_get_string(child, + ret = node_get_string(child, &windows_info->installation_type); } else if (node_name_is(child, "PRODUCTTYPE")) { - ret = node_get_string(child, + ret = node_get_string(child, &windows_info->product_type); } else if (node_name_is(child, "PRODUCTSUITE")) { - ret = node_get_string(child, + ret = node_get_string(child, &windows_info->product_suite); } else if (node_name_is(child, "LANGUAGES")) { - ret = xml_read_languages(child, + ret = xml_read_languages(child, &windows_info->languages, &windows_info->num_languages, &windows_info->default_language); } else if (node_name_is(child, "VERSION")) { - xml_read_windows_version(child, + xml_read_windows_version(child, &windows_info->windows_version); windows_info->windows_version_exists = true; } else if (node_name_is(child, "SYSTEMROOT")) { @@ -350,13 +357,13 @@ static int xml_read_windows_info(const xmlNode *windows_node, } /* Reads the information from an element. */ -static int xml_read_image_info(xmlNode *image_node, +static int xml_read_image_info(xmlNode *image_node, struct image_info *image_info) { xmlNode *child; xmlChar *index_prop; int ret; - + index_prop = xmlGetProp(image_node, "INDEX"); if (index_prop) { char *tmp; @@ -463,7 +470,7 @@ static int xml_read_wim_info(const xmlNode *wim_node, } /* Sort the array of struct image_infos by image index. */ - qsort(wim_info->images, wim_info->num_images, + qsort(wim_info->images, wim_info->num_images, sizeof(struct image_info), sort_by_index); done: *wim_info_ret = wim_info; @@ -480,33 +487,52 @@ static void print_windows_info(const struct windows_info *windows_info) const struct windows_version *windows_version; printf("Architecture: %s\n", get_arch(windows_info->arch)); - printf("Product Name: %s\n", windows_info->product_name); - printf("Edition ID: %s\n", windows_info->edition_id); - printf("Installation Type: %s\n", windows_info->installation_type); + + if (windows_info->product_name) + printf("Product Name: %s\n", + windows_info->product_name); + + if (windows_info->edition_id) + printf("Edition ID: %s\n", + windows_info->edition_id); + + if (windows_info->installation_type) + printf("Installation Type: %s\n", + windows_info->installation_type); + if (windows_info->hal) printf("HAL: %s\n", windows_info->hal); - printf("Product Type: %s\n", windows_info->product_type); + + if (windows_info->product_type) + printf("Product Type: %s\n", + windows_info->product_type); + if (windows_info->product_suite) - printf("Product Suite: %s\n", windows_info->product_suite); + printf("Product Suite: %s\n", + windows_info->product_suite); printf("Languages: "); for (i = 0; i < windows_info->num_languages; i++) { fputs(windows_info->languages[i], stdout); putchar(' '); } putchar('\n'); - printf("Default Language: %s\n", windows_info->default_language); - printf("System Root: %s\n", windows_info->system_root); + if (windows_info->default_language) + printf("Default Language: %s\n", + windows_info->default_language); + if (windows_info->system_root) + printf("System Root: %s\n", + windows_info->system_root); if (windows_info->windows_version_exists) { windows_version = &windows_info->windows_version; - printf("Major Version: %"PRIu64"\n", + printf("Major Version: %"PRIu64"\n", windows_version->major); - printf("Minor Version: %"PRIu64"\n", + printf("Minor Version: %"PRIu64"\n", windows_version->minor); - printf("Build: %"PRIu64"\n", + printf("Build: %"PRIu64"\n", windows_version->build); - printf("Service Pack Build: %"PRIu64"\n", + printf("Service Pack Build: %"PRIu64"\n", windows_version->sp_build); - printf("Service Pack Level: %"PRIu64"\n", + printf("Service Pack Level: %"PRIu64"\n", windows_version->sp_level); } } @@ -515,35 +541,35 @@ static void print_windows_info(const struct windows_info *windows_info) /* Writes the information contained in a struct windows_version structure to the XML * document being constructed in memory. This is the element inside * the element. */ -static int xml_write_windows_version(xmlTextWriter *writer, - const struct windows_version *version) +static int xml_write_windows_version(xmlTextWriter *writer, + const struct windows_version *version) { int rc; rc = xmlTextWriterStartElement(writer, "VERSION"); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "MAJOR", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "MAJOR", "%"PRIu64, version->major); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "MINOR", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "MINOR", "%"PRIu64, version->minor); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "BUILD", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "BUILD", "%"PRIu64, version->build); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "SPBUILD", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "SPBUILD", "%"PRIu64, version->sp_build); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "SPLEVEL", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "SPLEVEL", "%"PRIu64, version->sp_level); if (rc < 0) return rc; @@ -553,8 +579,8 @@ static int xml_write_windows_version(xmlTextWriter *writer, /* Writes the information contained in a struct windows_info structure to the XML * document being constructed in memory. This is the element. */ -static int xml_write_windows_info(xmlTextWriter *writer, - const struct windows_info *windows_info) +static int xml_write_windows_info(xmlTextWriter *writer, + const struct windows_info *windows_info) { int rc; rc = xmlTextWriterStartElement(writer, "WINDOWS"); @@ -562,55 +588,55 @@ static int xml_write_windows_info(xmlTextWriter *writer, return rc; - rc = xmlTextWriterWriteFormatElement(writer, "ARCH", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "ARCH", "%"PRIu64, windows_info->arch); if (rc < 0) return rc; - + if (windows_info->product_name) { - rc = xmlTextWriterWriteElement(writer, "PRODUCTNAME", + rc = xmlTextWriterWriteElement(writer, "PRODUCTNAME", windows_info->product_name); if (rc < 0) return rc; } if (windows_info->edition_id) { - rc = xmlTextWriterWriteElement(writer, "EDITIONID", + rc = xmlTextWriterWriteElement(writer, "EDITIONID", windows_info->edition_id); if (rc < 0) return rc; } if (windows_info->installation_type) { - rc = xmlTextWriterWriteElement(writer, "INSTALLATIONTYPE", + rc = xmlTextWriterWriteElement(writer, "INSTALLATIONTYPE", windows_info->installation_type); if (rc < 0) return rc; } if (windows_info->hal) { - rc = xmlTextWriterWriteElement(writer, "HAL", + rc = xmlTextWriterWriteElement(writer, "HAL", windows_info->hal); if (rc < 0) return rc; } if (windows_info->system_root) { - rc = xmlTextWriterWriteElement(writer, "SYSTEMROOT", + rc = xmlTextWriterWriteElement(writer, "SYSTEMROOT", windows_info->system_root); if (rc < 0) return rc; } if (windows_info->product_type) { - rc = xmlTextWriterWriteElement(writer, "PRODUCTTYPE", + rc = xmlTextWriterWriteElement(writer, "PRODUCTTYPE", windows_info->product_type); if (rc < 0) return rc; } if (windows_info->product_suite) { - rc = xmlTextWriterWriteElement(writer, "PRODUCTSUITE", + rc = xmlTextWriterWriteElement(writer, "PRODUCTSUITE", windows_info->product_suite); if (rc < 0) return rc; @@ -622,12 +648,12 @@ static int xml_write_windows_info(xmlTextWriter *writer, return rc; for (int i = 0; i < windows_info->num_languages; i++) { - rc = xmlTextWriterWriteElement(writer, "LANGUAGE", + rc = xmlTextWriterWriteElement(writer, "LANGUAGE", windows_info->languages[i]); if (rc < 0) return rc; } - rc = xmlTextWriterWriteElement(writer, "DEFAULT", + rc = xmlTextWriterWriteElement(writer, "DEFAULT", windows_info->default_language); if (rc < 0) return rc; @@ -647,15 +673,15 @@ static int xml_write_windows_info(xmlTextWriter *writer, } /* Writes a time element to the XML document being constructed in memory. */ -static int xml_write_time(xmlTextWriter *writer, const char *element_name, - u64 time) +static int xml_write_time(xmlTextWriter *writer, const char *element_name, + u64 time) { int rc; rc = xmlTextWriterStartElement(writer, element_name); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "HIGHPART", + rc = xmlTextWriterWriteFormatElement(writer, "HIGHPART", "0x%"PRIX32, (u32)(time >> 32)); if (rc < 0) return rc; @@ -673,7 +699,7 @@ static int xml_write_time(xmlTextWriter *writer, const char *element_name, /* Writes an element to the XML document. */ -static int xml_write_image_info(xmlTextWriter *writer, +static int xml_write_image_info(xmlTextWriter *writer, const struct image_info *image_info) { int rc; @@ -681,37 +707,37 @@ static int xml_write_image_info(xmlTextWriter *writer, if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatAttribute(writer, "INDEX", "%"PRIu64, + rc = xmlTextWriterWriteFormatAttribute(writer, "INDEX", "%"PRIu64, image_info->index); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "DIRCOUNT", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "DIRCOUNT", "%"PRIu64, image_info->dir_count); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "FILECOUNT", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "FILECOUNT", "%"PRIu64, image_info->file_count); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "TOTALBYTES", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "TOTALBYTES", "%"PRIu64, image_info->total_bytes); if (rc < 0) return rc; - rc = xmlTextWriterWriteFormatElement(writer, "HARDLINKBYTES", "%"PRIu64, + rc = xmlTextWriterWriteFormatElement(writer, "HARDLINKBYTES", "%"PRIu64, image_info->hard_link_bytes); if (rc < 0) return rc; - rc = xml_write_time(writer, "CREATIONTIME", + rc = xml_write_time(writer, "CREATIONTIME", image_info->creation_time); if (rc < 0) return rc; - rc = xml_write_time(writer, "LASTMODIFICATIONTIME", + rc = xml_write_time(writer, "LASTMODIFICATIONTIME", image_info->last_modification_time); if (rc < 0) return rc; @@ -730,19 +756,19 @@ static int xml_write_image_info(xmlTextWriter *writer, return rc; } if (image_info->description) { - rc = xmlTextWriterWriteElement(writer, "DESCRIPTION", + rc = xmlTextWriterWriteElement(writer, "DESCRIPTION", image_info->description); if (rc < 0) return rc; } if (image_info->display_name) { - rc = xmlTextWriterWriteElement(writer, "DISPLAYNAME", + rc = xmlTextWriterWriteElement(writer, "DISPLAYNAME", image_info->display_name); if (rc < 0) return rc; } if (image_info->display_description) { - rc = xmlTextWriterWriteElement(writer, "DISPLAYDESCRIPTION", + rc = xmlTextWriterWriteElement(writer, "DISPLAYDESCRIPTION", image_info->display_description); if (rc < 0) return rc; @@ -777,7 +803,7 @@ static struct image_info *add_image_info_struct(struct wim_info *wim_info) return &images[wim_info->num_images - 1]; } -static int clone_windows_info(const struct windows_info *old, +static int clone_windows_info(const struct windows_info *old, struct windows_info *new) { uint i; @@ -786,7 +812,7 @@ static int clone_windows_info(const struct windows_info *old, return WIMLIB_ERR_NOMEM; if (old->edition_id && !(new->edition_id = STRDUP(old->edition_id))) return WIMLIB_ERR_NOMEM; - if (old->installation_type && !(new->installation_type = + if (old->installation_type && !(new->installation_type = STRDUP(old->installation_type))) return WIMLIB_ERR_NOMEM; if (old->hal && !(new->hal = STRDUP(old->hal))) @@ -809,18 +835,21 @@ static int clone_windows_info(const struct windows_info *old, return WIMLIB_ERR_NOMEM; } } - if (old->default_language && + if (old->default_language && !(new->default_language = STRDUP(old->default_language))) return WIMLIB_ERR_NOMEM; if (old->system_root && !(new->system_root = STRDUP(old->system_root))) return WIMLIB_ERR_NOMEM; + if (old->windows_version_exists) { + new->windows_version_exists = true; + memcpy(&new->windows_version, &old->windows_version, + sizeof(old->windows_version)); + } return 0; } static int clone_image_info(const struct image_info *old, struct image_info *new) { - int ret; - new->dir_count = old->dir_count; new->file_count = old->file_count; new->total_bytes = old->total_bytes; @@ -849,34 +878,35 @@ static int clone_image_info(const struct image_info *old, struct image_info *new if (old->windows_info_exists) { new->windows_info_exists = true; - return clone_windows_info(&old->windows_info, + return clone_windows_info(&old->windows_info, &new->windows_info); } return 0; } -/* Copies the XML information for an image between WIM files. +/* Copies the XML information for an image between WIM files. * * @dest_image_name and @dest_image_description are ignored if they are NULL; * otherwise, they are used to override the image name and/or image description - * from the XML data in the source WIM file. */ -int xml_export_image(const struct wim_info *old_wim_info, - int image, - struct wim_info **new_wim_info_p, - const char *dest_image_name, + * from the XML data in the source WIM file. + * + * On failure, WIMLIB_ERR_NOMEM is returned and no changes are made. Otherwise, + * 0 is returned and the WIM information at *new_wim_info_p is modified. + */ +int xml_export_image(const struct wim_info *old_wim_info, + int image, + struct wim_info **new_wim_info_p, + const char *dest_image_name, const char *dest_image_description) { struct wim_info *new_wim_info; struct image_info *image_info; int ret; - char *name; - char *desc; DEBUG("Copying XML data between WIM files for source image %d.", image); wimlib_assert(image >= 1 && image <= old_wim_info->num_images); - if (*new_wim_info_p) { new_wim_info = *new_wim_info_p; } else { @@ -922,7 +952,7 @@ void xml_delete_image(struct wim_info **wim_info_p, int image) int i; DEBUG("Deleting image %d from the XML data.", image); - + wim_info = *wim_info_p; wimlib_assert(wim_info); @@ -961,36 +991,112 @@ void xml_set_memory_allocator(void *(*malloc_func)(size_t), } #endif +static int calculate_dentry_statistics(struct dentry *dentry, void *arg) +{ + struct image_info *info = arg; + struct lookup_table *lookup_table = info->lookup_table; + const struct inode *inode = dentry->d_inode; + struct lookup_table_entry *lte; + + /* 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)) + return 0; + + if (inode_is_directory(inode)) + info->dir_count++; + else + info->file_count++; + + /* + * Update total bytes and hard link bytes. + * + * Unfortunately there are some inconsistencies/bugs in the way this is + * done. + * + * 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). + */ + lte = inode_unnamed_lte(inode, info->lookup_table); + if (lte) { + info->total_bytes += wim_resource_size(lte); + if (!dentry_is_first_in_inode(dentry)) + info->hard_link_bytes += wim_resource_size(lte); + } + + if (inode->link_count >= 2 && dentry_is_first_in_inode(dentry)) { + for (unsigned i = 0; i < inode->num_ads; i++) { + if (inode->ads_entries[i].stream_name_len) { + lte = inode_stream_lte(inode, i + 1, lookup_table); + if (lte) { + info->hard_link_bytes += inode->link_count * + wim_resource_size(lte); + } + } + } + } + return 0; +} + void xml_update_image_info(WIMStruct *w, int image) { struct image_info *image_info; - struct dentry *root; + char *flags_save; DEBUG("Updating the image info for image %d", image); image_info = &w->wim_info->images[image - 1]; - root = w->image_metadata[image - 1].root_dentry; - calculate_dir_tree_statistics(root, w->lookup_table, - &image_info->dir_count, - &image_info->file_count, - &image_info->total_bytes, - &image_info->hard_link_bytes); + image_info->file_count = 0; + image_info->dir_count = 0; + image_info->total_bytes = 0; + image_info->hard_link_bytes = 0; + + flags_save = image_info->flags; + image_info->lookup_table = w->lookup_table; + for_dentry_in_tree(w->image_metadata[image - 1].root_dentry, + calculate_dentry_statistics, + image_info); + + image_info->lookup_table = NULL; + image_info->flags = flags_save; image_info->last_modification_time = get_wim_timestamp(); } /* Adds an image to the XML information. */ -int xml_add_image(WIMStruct *w, struct dentry *root_dentry, const char *name, - const char *description, const char *flags_element) +int xml_add_image(WIMStruct *w, const char *name) { struct wim_info *wim_info; struct image_info *image_info; wimlib_assert(name); - DEBUG("Adding image: name = %s, description = %s, flags_element = %s", - name, description, flags_element); + DEBUG("Adding image: name = %s", name); /* If this is the first image, allocate the struct wim_info. Otherwise * use the existing struct wim_info. */ @@ -1013,11 +1119,6 @@ int xml_add_image(WIMStruct *w, struct dentry *root_dentry, const char *name, if (!(image_info->name = STRDUP(name))) goto out_destroy_image_info; - if (description && !(image_info->description = STRDUP(description))) - goto out_destroy_image_info; - if (flags_element && !(image_info->flags = STRDUP(flags_element))) - goto out_destroy_image_info; - w->wim_info = wim_info; image_info->index = wim_info->num_images; image_info->creation_time = get_wim_timestamp(); @@ -1026,109 +1127,102 @@ int xml_add_image(WIMStruct *w, struct dentry *root_dentry, const char *name, out_destroy_image_info: destroy_image_info(image_info); + wim_info->num_images--; out_free_wim_info: - if (w->wim_info) - wim_info->num_images--; - else + if (wim_info != w->wim_info) FREE(wim_info); ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; } -/* Prints information about the specified image from struct wim_info structure. - * @image may be WIM_ALL_IMAGES. */ +/* Prints information about the specified image from struct wim_info structure. + * */ void print_image_info(const struct wim_info *wim_info, int image) { - uint i; const struct image_info *image_info; const char *desc; - time_t ctime; - time_t mtime; + time_t time; + char *p; + wimlib_assert(image >= 1 && image <= wim_info->num_images); - if (image == WIM_ALL_IMAGES) { - for (i = 1; i <= wim_info->num_images; i++) - print_image_info(wim_info, i); - } else { - image_info = &wim_info->images[image - 1]; + image_info = &wim_info->images[image - 1]; - printf("Index: %"PRIu64"\n", - image_info->index); - printf("Name: %s\n", - image_info->name); - - /* Always print the Description: part even if there is no - * description. */ - if (image_info->description) - desc = image_info->description; - else - desc = ""; - printf("Description: %s\n", desc); - - if (image_info->display_name) - printf("Display Name: %s\n", - image_info->display_name); - - if (image_info->display_description) - printf("Display Description: %s\n", - image_info->display_description); - - printf("Directory Count: %"PRIu64"\n", - image_info->dir_count); - printf("File Count: %"PRIu64"\n", - image_info->file_count); - printf("Total Bytes: %"PRIu64"\n", - image_info->total_bytes); - printf("Hard Link Bytes: %"PRIu64"\n", - image_info->hard_link_bytes); - - ctime = wim_timestamp_to_unix(image_info->creation_time); - mtime = wim_timestamp_to_unix(image_info->last_modification_time); - - printf("Creation Time: %s", asctime(localtime(&ctime))); - printf("Last Modification Time: %s", asctime(localtime(&mtime))); - if (image_info->windows_info_exists) - print_windows_info(&image_info->windows_info); - if (image_info->flags) - printf("Flags: %s\n", image_info->flags); - putchar('\n'); - } + printf("Index: %"PRIu64"\n", image_info->index); + printf("Name: %s\n", image_info->name); + + /* Always print the Description: part even if there is no + * description. */ + if (image_info->description) + desc = image_info->description; + else + desc = ""; + printf("Description: %s\n", desc); + + if (image_info->display_name) + printf("Display Name: %s\n", + image_info->display_name); + + if (image_info->display_description) + printf("Display Description: %s\n", + image_info->display_description); + + printf("Directory Count: %"PRIu64"\n", image_info->dir_count); + printf("File Count: %"PRIu64"\n", image_info->file_count); + printf("Total Bytes: %"PRIu64"\n", image_info->total_bytes); + printf("Hard Link Bytes: %"PRIu64"\n", image_info->hard_link_bytes); + + time = wim_timestamp_to_unix(image_info->creation_time); + p = asctime(gmtime(&time)); + *(strrchr(p, '\n')) = '\0'; + + printf("Creation Time: %s UTC\n", p); + + time = wim_timestamp_to_unix(image_info->last_modification_time); + p = asctime(gmtime(&time)); + *(strrchr(p, '\n')) = '\0'; + + printf("Last Modification Time: %s UTC\n", p); + if (image_info->windows_info_exists) + print_windows_info(&image_info->windows_info); + if (image_info->flags) + printf("Flags: %s\n", image_info->flags); + putchar('\n'); } -/* +/* * Reads the XML data from a WIM file. */ -int read_xml_data(FILE *fp, const struct resource_entry *res, u8 **xml_data_ret, - struct wim_info **info_ret) +int read_xml_data(FILE *fp, const struct resource_entry *res, + u8 **xml_data_ret, struct wim_info **info_ret) { u8 *xml_data; xmlDoc *doc; xmlNode *root; int ret; - DEBUG("XML data is %"PRIu64" bytes at offset %"PRIu64"", + DEBUG("XML data is %"PRIu64" bytes at offset %"PRIu64"", (u64)res->size, res->offset); if (resource_is_compressed(res)) { ERROR("XML data is supposed to be uncompressed"); ret = WIMLIB_ERR_XML; - goto err0; + goto out_cleanup_parser; } if (res->size < 2) { ERROR("XML data must be at least 2 bytes"); ret = WIMLIB_ERR_XML; - goto err0; + goto out_cleanup_parser; } xml_data = MALLOC(res->size + 2); if (!xml_data) { ret = WIMLIB_ERR_NOMEM; - goto err0; + goto out_cleanup_parser; } - ret = read_full_resource(fp, res->size, res->size, res->offset, - WIM_COMPRESSION_TYPE_NONE, xml_data); + ret = read_uncompressed_resource(fp, res->offset, res->size, xml_data); if (ret != 0) - goto err1; + goto out_free_xml_data; xml_data[res->size] = 0; xml_data[res->size + 1] = 0; @@ -1141,7 +1235,7 @@ int read_xml_data(FILE *fp, const struct resource_entry *res, u8 **xml_data_ret, if (!doc) { ERROR("Failed to parse XML data"); ret = WIMLIB_ERR_XML; - goto err1; + goto out_free_xml_data; } DEBUG("Constructing WIM information structure from XML tree."); @@ -1150,19 +1244,19 @@ int read_xml_data(FILE *fp, const struct resource_entry *res, u8 **xml_data_ret, if (!root) { ERROR("Empty XML document"); ret = WIMLIB_ERR_XML; - goto err2; + goto out_free_doc; } if (!node_is_element(root) || !node_name_is(root, "WIM")) { ERROR("Expected for the root XML element (found <%s>)", root->name); ret = WIMLIB_ERR_XML; - goto err2; + goto out_free_doc; } ret = xml_read_wim_info(root, info_ret); if (ret != 0) - goto err2; + goto out_free_doc; DEBUG("Freeing XML tree."); @@ -1170,11 +1264,11 @@ int read_xml_data(FILE *fp, const struct resource_entry *res, u8 **xml_data_ret, xmlCleanupParser(); *xml_data_ret = xml_data; return 0; -err2: +out_free_doc: xmlFreeDoc(doc); -err1: +out_free_xml_data: FREE(xml_data); -err0: +out_cleanup_parser: xmlCleanupParser(); return ret; } @@ -1182,34 +1276,37 @@ err0: #define CHECK_RET ({ if (ret < 0) { \ ERROR("Error writing XML data"); \ ret = WIMLIB_ERR_WRITE; \ - goto err2; \ + goto out_free_text_writer; \ } }) -/* +/* * Writes XML data to a WIM file. * * If @total_bytes is non-zero, it specifies what to write to the TOTALBYTES * element in the XML data. If zero, TOTALBYTES is given the default value of * the offset of the XML data. */ -int write_xml_data(const struct wim_info *wim_info, int image, FILE *out, - u64 total_bytes) +int write_xml_data(const struct wim_info *wim_info, int image, FILE *out, + u64 total_bytes, struct resource_entry *out_res_entry) { xmlBuffer *buf; xmlTextWriter *writer; char *utf16_str; int ret; - int num_images; - int i; const xmlChar *content; size_t len; size_t utf16_len; size_t bytes_written; + off_t start_offset, end_offset; - wimlib_assert(image == WIM_ALL_IMAGES || - (wim_info != NULL && image >= 1 && + wimlib_assert(image == WIMLIB_ALL_IMAGES || + (wim_info != NULL && image >= 1 && image <= wim_info->num_images)); + start_offset = ftello(out); + if (start_offset == -1) + return WIMLIB_ERR_WRITE; + /* The contents of the element in the XML data, under the * element not the element, is (for non-spit WIMs) the * size of the WIM file excluding the XML data and integrity table, @@ -1226,13 +1323,13 @@ int write_xml_data(const struct wim_info *wim_info, int image, FILE *out, if (!buf) { ERROR("Failed to allocate XML buffer"); ret = WIMLIB_ERR_NOMEM; - goto err0; + goto out; } writer = xmlNewTextWriterMemory(buf, 0); if (!writer) { ERROR("Failed to allocate XML writer"); ret = WIMLIB_ERR_NOMEM; - goto err1; + goto out_buffer_free; } /* XXX */ @@ -1253,18 +1350,15 @@ int write_xml_data(const struct wim_info *wim_info, int image, FILE *out, total_bytes); CHECK_RET; - if (wim_info) - num_images = wim_info->num_images; - else - num_images = 0; - DEBUG("Writing %u elements", num_images); - - for (i = 1; i <= num_images; i++) { - if (image != WIM_ALL_IMAGES && i != image) - continue; - DEBUG("Writing element for image %d", i); - ret = xml_write_image_info(writer, &wim_info->images[i - 1]); - CHECK_RET; + if (wim_info != NULL) { + DEBUG("Writing %d elements", (int)wim_info->num_images); + for (int i = 1; i <= (int)wim_info->num_images; i++) { + if (image != WIMLIB_ALL_IMAGES && i != image) + continue; + DEBUG("Writing element for image %d", i); + ret = xml_write_image_info(writer, &wim_info->images[i - 1]); + CHECK_RET; + } } ret = xmlTextWriterEndElement(writer); @@ -1273,36 +1367,52 @@ int write_xml_data(const struct wim_info *wim_info, int image, FILE *out, ret = xmlTextWriterEndDocument(writer); CHECK_RET; + xmlFreeTextWriter(writer); + writer = NULL; DEBUG("Done composing XML document. Now converting to UTF-16 and " "writing it to the output file."); content = xmlBufferContent(buf); len = xmlBufferLength(buf); + DEBUG("XML UTF-8 length = %zu", len); + utf16_str = utf8_to_utf16(content, len, &utf16_len); if (!utf16_str) { ret = WIMLIB_ERR_NOMEM; - goto err2; + goto out_free_text_writer; } - if ((putc(0xff, out)) == EOF || (putc(0xfe, out) == EOF) || + DEBUG("XML UTF-16 length = %zu", utf16_len); + + if ((putc(0xff, out)) == EOF || (putc(0xfe, out) == EOF) || ((bytes_written = fwrite(utf16_str, 1, utf16_len, out)) != utf16_len)) { ERROR_WITH_ERRNO("Error writing XML data"); ret = WIMLIB_ERR_WRITE; - goto err3; + goto out_free_utf16_str; } DEBUG("Cleaning up."); + end_offset = ftello(out); + if (end_offset == -1) { + ret = WIMLIB_ERR_WRITE; + goto out_free_utf16_str; + } + + out_res_entry->offset = start_offset; + out_res_entry->size = end_offset - start_offset; + out_res_entry->original_size = end_offset - start_offset; + out_res_entry->flags = WIM_RESHDR_FLAG_METADATA; ret = 0; -err3: +out_free_utf16_str: FREE(utf16_str); -err2: +out_free_text_writer: xmlFreeTextWriter(writer); -err1: +out_buffer_free: xmlBufferFree(buf); -err0: +out: return ret; } @@ -1317,7 +1427,7 @@ WIMLIBAPI const char *wimlib_get_image_name(const WIMStruct *w, int image) } /* Returns the description of the specified image. */ -WIMLIBAPI const char *wimlib_get_image_description(const WIMStruct *w, +WIMLIBAPI const char *wimlib_get_image_description(const WIMStruct *w, int image) { DEBUG("Getting the description of image %d", image); @@ -1333,7 +1443,7 @@ WIMLIBAPI bool wimlib_image_name_in_use(const WIMStruct *w, const char *name) int i; DEBUG("Checking to see if the image name `%s' is already in use", name); - if (!name || !w->wim_info) + if (!name || !*name || !w->wim_info) return false; for (i = 1; i <= w->wim_info->num_images; i++) if (strcmp(w->wim_info->images[i - 1].name, name) == 0) @@ -1345,7 +1455,10 @@ WIMLIBAPI bool wimlib_image_name_in_use(const WIMStruct *w, const char *name) WIMLIBAPI int wimlib_extract_xml_data(WIMStruct *w, FILE *fp) { DEBUG("Extracting the XML data."); - if (fwrite(w->xml_data, 1, w->hdr.xml_res_entry.size, fp) != + if (!w->xml_data) + return WIMLIB_ERR_INVALID_PARAM; + + if (fwrite(w->xml_data, 1, w->hdr.xml_res_entry.size, fp) != w->hdr.xml_res_entry.size) { ERROR_WITH_ERRNO("Failed to extract XML data"); return WIMLIB_ERR_WRITE; @@ -1361,6 +1474,9 @@ WIMLIBAPI int wimlib_set_image_name(WIMStruct *w, int image, const char *name) DEBUG("Setting the name of image %d to %s", image, name); + if (!w) + return WIMLIB_ERR_INVALID_PARAM; + if (!name || !*name) { ERROR("Must specify a non-empty string for the image name"); return WIMLIB_ERR_INVALID_PARAM; @@ -1391,13 +1507,16 @@ WIMLIBAPI int wimlib_set_image_name(WIMStruct *w, int image, const char *name) } /* Sets the description of an image in the WIM. */ -WIMLIBAPI int wimlib_set_image_descripton(WIMStruct *w, int image, +WIMLIBAPI int wimlib_set_image_descripton(WIMStruct *w, int image, const char *description) { char *p; DEBUG("Setting the description of image %d to %s", image, description); + if (!w) + return WIMLIB_ERR_INVALID_PARAM; + if (image < 1 || image > w->hdr.image_count) { ERROR("%d is not a valid image", image); return WIMLIB_ERR_INVALID_IMAGE; @@ -1415,3 +1534,28 @@ WIMLIBAPI int wimlib_set_image_descripton(WIMStruct *w, int image, w->wim_info->images[image - 1].description = p; return 0; } + +WIMLIBAPI int wimlib_set_image_flags(WIMStruct *w, int image, + const char *flags) +{ + char *p; + + DEBUG("Setting the flags of image %d to %s", image, flags); + + if (image < 1 || image > w->hdr.image_count) { + ERROR("%d is not a valid image", image); + return WIMLIB_ERR_INVALID_IMAGE; + } + if (flags) { + p = STRDUP(flags); + if (!p) { + ERROR("Out of memory"); + return WIMLIB_ERR_NOMEM; + } + } else { + p = NULL; + } + FREE(w->wim_info->images[image - 1].flags); + w->wim_info->images[image - 1].flags = p; + return 0; +}