X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fxml.c;h=440398954a3d4e53b9c48a2bd8f8238a0c710052;hb=e0beab67ce67493da928a9fe5957c1f258073b9a;hp=03b0b7002f8274e7858f6fc105876a62bb955127;hpb=17e325843b1d1ae7758ae799a269e51a9cfea4dd;p=wimlib diff --git a/src/xml.c b/src/xml.c index 03b0b700..44039895 100644 --- a/src/xml.c +++ b/src/xml.c @@ -2,37 +2,40 @@ * xml.c * * Deals with the XML information in WIM files. Uses the C library libxml2. - * + */ + +/* * Copyright (C) 2012 Eric Biggers * - * wimlib - Library for working with WIM files + * This file is part of wimlib, a library for working with WIM files. * - * This library 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) any - * later version. + * wimlib is free software; you can redistribute it and/or modify it under the + * 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. * - * This library 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 details. + * 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 General Public License for more + * details. * - * You should have received a copy of the GNU Lesser General Public License along - * with this library; if not, write to the Free Software Foundation, Inc., 59 - * Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with wimlib; if not, see http://www.gnu.org/licenses/. */ #include "wimlib_internal.h" #include "dentry.h" #include "xml.h" #include "timestamp.h" +#include "lookup_table.h" #include - +#include #include #include #include -/* The following 4 structures are used to form an in-memory representation of - * the XML data (other than the raw parse tree from libxml). */ +/* Structures used to form an in-memory representation of the XML data (other + * than the raw parse tree from libxml). */ struct windows_version { u64 major; @@ -72,7 +75,10 @@ struct image_info { char *description; char *display_name; char *display_description; - char *flags; + union { + char *flags; + struct lookup_table *lookup_table; + }; }; @@ -97,8 +103,8 @@ static const char *get_arch(int arch) /* Iterate through the children of an xmlNode. */ -#define for_node_child(parent, child) for (child = parent->children; \ - child != NULL; child = child->next) +#define for_node_child(parent, child) \ + for (child = parent->children; child != NULL; child = child->next) /* Utility functions for xmlNodes */ static inline bool node_is_element(xmlNode *node) @@ -152,8 +158,10 @@ static int node_get_string(const xmlNode *string_node, char **str) for_node_child(string_node, child) { if (node_is_text(child) && child->content) { p = STRDUP(child->content); - if (!p) + if (!p) { + ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; + } break; } } @@ -201,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); } @@ -274,8 +285,10 @@ static int xml_read_languages(const xmlNode *languages_node, num_languages++; languages = CALLOC(num_languages, sizeof(char*)); - if (!languages) + if (!languages) { + ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; + } *languages_ret = languages; *num_languages_ret = num_languages; @@ -292,7 +305,7 @@ static int xml_read_languages(const xmlNode *languages_node, if (ret != 0) return ret; } - return 0; + return ret; } /* Reads the information from a element inside an element. */ @@ -340,7 +353,7 @@ static int xml_read_windows_info(const xmlNode *windows_node, if (ret != 0) return ret; } - return 0; + return ret; } /* Reads the information from an element. */ @@ -353,7 +366,8 @@ static int xml_read_image_info(xmlNode *image_node, index_prop = xmlGetProp(image_node, "INDEX"); if (index_prop) { - image_info->index = strtoul(index_prop, NULL, 10); + char *tmp; + image_info->index = strtoul(index_prop, &tmp, 10); FREE(index_prop); } else { image_info->index = 0; @@ -376,9 +390,9 @@ static int xml_read_image_info(xmlNode *image_node, else if (node_name_is(child, "LASTMODIFICATIONTIME")) image_info->last_modification_time = node_get_timestamp(child); else if (node_name_is(child, "WINDOWS")) { - DEBUG("Found tag\n"); - ret = xml_read_windows_info(child, - &image_info->windows_info); + DEBUG("Found tag"); + ret = xml_read_windows_info(child, + &image_info->windows_info); image_info->windows_info_exists = true; } else if (node_name_is(child, "NAME")) { ret = node_get_string(child, &image_info->name); @@ -395,23 +409,22 @@ static int xml_read_image_info(xmlNode *image_node, return ret; } if (!image_info->name) { - WARNING("Image with index %"PRIu64" has no name\n", - image_info->index); + WARNING("Image with index %"PRIu64" has no name", + image_info->index); image_info->name = MALLOC(1); if (!image_info->name) { - ERROR("Out of memory!\n"); + ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; } image_info->name[0] = '\0'; - return 0; } - - return 0; + return ret; } /* Reads the information from a element, which should be the root element * of the XML tree. */ -static int xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info_ret) +static int xml_read_wim_info(const xmlNode *wim_node, + struct wim_info **wim_info_ret) { struct wim_info *wim_info; xmlNode *child; @@ -421,7 +434,7 @@ static int xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info wim_info = CALLOC(1, sizeof(struct wim_info)); if (!wim_info) { - ERROR("Out of memory!\n"); + ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; } @@ -438,7 +451,7 @@ static int xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info wim_info->images = CALLOC(num_images, sizeof(wim_info->images[0])); if (!wim_info->images) { ret = WIMLIB_ERR_NOMEM; - ERROR("Out of memory!\n"); + ERROR("Out of memory!"); goto err; } wim_info->num_images = num_images; @@ -447,7 +460,7 @@ static int xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info if (!node_is_element(child)) continue; if (node_name_is(child, "IMAGE")) { - DEBUG("Found tag\n"); + DEBUG("Found tag"); ret = xml_read_image_info(child, cur_image_info++); if (ret != 0) goto err; @@ -715,7 +728,7 @@ static int xml_write_image_info(xmlTextWriter *writer, if (rc < 0) return rc; } else { - DEBUG(" tag does not exist.\n"); + DEBUG(" tag does not exist."); } if (image_info->name) { @@ -763,8 +776,8 @@ static struct image_info *add_image_info_struct(struct wim_info *wim_info) images = CALLOC(wim_info->num_images + 1, sizeof(struct image_info)); if (!images) return NULL; - memcpy(images, wim_info->images, - wim_info->num_images * sizeof(struct image_info)); + memcpy(images, wim_info->images, + wim_info->num_images * sizeof(struct image_info)); FREE(wim_info->images); wim_info->images = images; wim_info->num_images++; @@ -808,13 +821,16 @@ static int clone_windows_info(const struct windows_info *old, 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; @@ -853,7 +869,11 @@ static int clone_image_info(const struct image_info *old, struct image_info *new * * @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. */ + * 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, @@ -863,15 +883,11 @@ int xml_export_image(const struct wim_info *old_wim_info, 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\n", - image); + 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 { @@ -905,7 +921,7 @@ int xml_export_image(const struct wim_info *old_wim_info, *new_wim_info_p = new_wim_info; return 0; err: - ERROR("Out of memory!\n"); + ERROR("Out of memory"); free_wim_info(new_wim_info); return WIMLIB_ERR_NOMEM; } @@ -916,7 +932,7 @@ void xml_delete_image(struct wim_info **wim_info_p, int image) struct wim_info *wim_info; int i; - DEBUG("Deleting image %d from the XML data\n", image); + DEBUG("Deleting image %d from the XML data.", image); wim_info = *wim_info_p; @@ -956,77 +972,148 @@ 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\n", image); + 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->last_modification_time = get_timestamp(); + 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\n", - 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. */ if (w->wim_info) { wim_info = w->wim_info; } else { - DEBUG("Allocing struct wim_info with 1 image\n"); + DEBUG("Allocing struct wim_info with 1 image"); wim_info = CALLOC(1, sizeof(struct wim_info)); if (!wim_info) { ERROR("Could not allocate WIM information struct--- " - "out of memory!\n"); + "out of memory"); return WIMLIB_ERR_NOMEM; } } image_info = add_image_info_struct(wim_info); if (!image_info) - goto err_nomem1; + goto out_free_wim_info; if (!(image_info->name = STRDUP(name))) - goto err_nomem2; + goto out_destroy_image_info; - if (description && !(image_info->description = STRDUP(description))) - goto err_nomem2; - if (flags_element && !(image_info->flags = STRDUP(flags_element))) - goto err_nomem2; - w->wim_info = wim_info; image_info->index = wim_info->num_images; - image_info->creation_time = get_timestamp(); + image_info->creation_time = get_wim_timestamp(); xml_update_image_info(w, image_info->index); return 0; -err_nomem2: +out_destroy_image_info: destroy_image_info(image_info); -err_nomem1: - if (w->wim_info) - wim_info->num_images--; - else + wim_info->num_images--; +out_free_wim_info: + if (wim_info != w->wim_info) FREE(wim_info); - ERROR("Out of memory!\n"); + ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; } @@ -1037,15 +1124,15 @@ 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; - DEBUG("Printing the image info for image %d\n", image); if (image == WIM_ALL_IMAGES) { for (i = 1; i <= wim_info->num_images; i++) print_image_info(wim_info, i); } else { + time_t time; + char *p; + image_info = &wim_info->images[image - 1]; printf("Index: %"PRIu64"\n", @@ -1078,11 +1165,17 @@ void print_image_info(const struct wim_info *wim_info, int image) printf("Hard Link Bytes: %"PRIu64"\n", image_info->hard_link_bytes); - ctime = ms_timestamp_to_unix(image_info->creation_time); - mtime = ms_timestamp_to_unix(image_info->last_modification_time); + time = wim_timestamp_to_unix(image_info->creation_time); + p = asctime(gmtime(&time)); + *(strrchr(p, '\n')) = '\0'; - printf("Creation Time: %s", asctime(localtime(&ctime))); - printf("Last Modification Time: %s", asctime(localtime(&mtime))); + 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) @@ -1102,94 +1195,98 @@ int read_xml_data(FILE *fp, const struct resource_entry *res, u8 **xml_data_ret, xmlNode *root; int ret; - DEBUG("XML data is %"PRIu64" bytes long.\n", (u64)res->size); + 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!\n"); + 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!\n"); + 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; - DEBUG("Parsing XML using libxml2 to create XML tree.\n"); + DEBUG("Parsing XML using libxml2 to create XML tree."); doc = xmlReadMemory(xml_data, res->size, "noname.xml", "UTF-16", 0); if (!doc) { - ERROR("Failed to parse XML data!\n"); + 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.\n"); + DEBUG("Constructing WIM information structure from XML tree."); root = xmlDocGetRootElement(doc); if (!root) { - ERROR("Empty XML document!\n"); + 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>)\n", root->name); + 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.\n"); + DEBUG("Freeing XML tree."); xmlFreeDoc(doc); 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; } #define CHECK_RET ({ if (ret < 0) { \ - ERROR("Error writing XML data!\n"); \ + ERROR("Error writing XML data"); \ ret = WIMLIB_ERR_WRITE; \ goto err2; \ } }) /* * 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) +int write_xml_data(const struct wim_info *wim_info, int image, FILE *out, + u64 total_bytes) { xmlBuffer *buf; xmlTextWriter *writer; char *utf16_str; int ret; - off_t total_bytes; int num_images; int i; const xmlChar *content; @@ -1202,24 +1299,26 @@ int write_xml_data(const struct wim_info *wim_info, int image, FILE *out) image <= wim_info->num_images)); /* The contents of the element in the XML data, under the - * element not the element, is the size of the WIM file - * excluding the XML data and integrity table. Which is the current - * offset, since the XML data goes at the end of the WIM file before the - * integrity table. */ - total_bytes = ftello(out); - if (total_bytes == -1) - return WIMLIB_ERR_WRITE; + * element not the element, is (for non-spit WIMs) the + * size of the WIM file excluding the XML data and integrity table, + * which is the current offset, since the XML data goes at the end of + * the WIM file before the integrity table. */ + if (total_bytes == 0) { + total_bytes = ftello(out); + if (total_bytes == (u64)-1) + return WIMLIB_ERR_WRITE; + } - DEBUG("Creating XML buffer and text writer\n"); + DEBUG("Creating XML buffer and text writer."); buf = xmlBufferCreate(); if (!buf) { - ERROR("Failed to allocate XML buffer!\n"); + ERROR("Failed to allocate XML buffer"); ret = WIMLIB_ERR_NOMEM; goto err0; } writer = xmlNewTextWriterMemory(buf, 0); if (!writer) { - ERROR("Failed to allocate XML writer!\n"); + ERROR("Failed to allocate XML writer"); ret = WIMLIB_ERR_NOMEM; goto err1; } @@ -1234,7 +1333,7 @@ int write_xml_data(const struct wim_info *wim_info, int image, FILE *out) CHECK_RET; #endif - DEBUG("Writing element\n"); + DEBUG("Writing element"); ret = xmlTextWriterStartElement(writer, "WIM"); CHECK_RET; @@ -1246,12 +1345,12 @@ int write_xml_data(const struct wim_info *wim_info, int image, FILE *out) num_images = wim_info->num_images; else num_images = 0; - DEBUG("Writing %u elements\n", num_images); + 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\n", i); + DEBUG("Writing element for image %d", i); ret = xml_write_image_info(writer, &wim_info->images[i - 1]); CHECK_RET; } @@ -1263,7 +1362,7 @@ int write_xml_data(const struct wim_info *wim_info, int image, FILE *out) CHECK_RET; DEBUG("Done composing XML document. Now converting to UTF-16 and " - "writing it to the output file.\n"); + "writing it to the output file."); content = xmlBufferContent(buf); len = xmlBufferLength(buf); @@ -1277,12 +1376,12 @@ int write_xml_data(const struct wim_info *wim_info, int image, FILE *out) if ((putc(0xff, out)) == EOF || (putc(0xfe, out) == EOF) || ((bytes_written = fwrite(utf16_str, 1, utf16_len, out)) != utf16_len)) { - ERROR("Error writing XML data: %m\n"); + ERROR_WITH_ERRNO("Error writing XML data"); ret = WIMLIB_ERR_WRITE; goto err3; } - DEBUG("Cleaning up.\n"); + DEBUG("Cleaning up."); ret = 0; err3: @@ -1298,7 +1397,7 @@ err0: /* Returns the name of the specified image. */ WIMLIBAPI const char *wimlib_get_image_name(const WIMStruct *w, int image) { - DEBUG("Getting the name of image %d\n", image); + DEBUG("Getting the name of image %d", image); if (image < 1 || image > w->hdr.image_count) return NULL; @@ -1309,7 +1408,7 @@ WIMLIBAPI const char *wimlib_get_image_name(const WIMStruct *w, int image) WIMLIBAPI const char *wimlib_get_image_description(const WIMStruct *w, int image) { - DEBUG("Getting the description of image %d\n", image); + DEBUG("Getting the description of image %d", image); if (image < 1 || image > w->hdr.image_count) return NULL; @@ -1321,8 +1420,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\n", name); + DEBUG("Checking to see if the image name `%s' is already in use", name); if (!name || !w->wim_info) return false; for (i = 1; i <= w->wim_info->num_images; i++) @@ -1334,10 +1432,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.\n"); + DEBUG("Extracting the XML data."); if (fwrite(w->xml_data, 1, w->hdr.xml_res_entry.size, fp) != w->hdr.xml_res_entry.size) { - ERROR("Failed to extract XML data!\n"); + ERROR_WITH_ERRNO("Failed to extract XML data"); return WIMLIB_ERR_WRITE; } return 0; @@ -1349,15 +1447,17 @@ WIMLIBAPI int wimlib_set_image_name(WIMStruct *w, int image, const char *name) char *p; int i; - DEBUG("Setting the name of image %d to %s\n", image, 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!\n"); + ERROR("Must specify a non-empty string for the image name"); return WIMLIB_ERR_INVALID_PARAM; } if (image < 1 || image > w->hdr.image_count) { - ERROR("%d is not a valid image!\n", image); + ERROR("%d is not a valid image", image); return WIMLIB_ERR_INVALID_IMAGE; } @@ -1365,15 +1465,15 @@ WIMLIBAPI int wimlib_set_image_name(WIMStruct *w, int image, const char *name) if (i == image) continue; if (strcmp(w->wim_info->images[i - 1].name, name) == 0) { - ERROR("The name `%s' is already used for image %d!\n", - name, i); + ERROR("The name `%s' is already used for image %d", + name, i); return WIMLIB_ERR_IMAGE_NAME_COLLISION; } } p = STRDUP(name); if (!p) { - ERROR("Out of memory!\n"); + ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; } FREE(w->wim_info->images[image - 1].name); @@ -1387,17 +1487,19 @@ WIMLIBAPI int wimlib_set_image_descripton(WIMStruct *w, int image, { char *p; - DEBUG("Setting the description of image %d to %s\n", image, - description); + 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!\n", image); + ERROR("%d is not a valid image", image); return WIMLIB_ERR_INVALID_IMAGE; } if (description) { p = STRDUP(description); if (!p) { - ERROR("Out of memory!\n"); + ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; } } else { @@ -1407,3 +1509,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; +}