Delay xml_update_image_info() until write

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index fdc3ed2ff07259a0d98eef3a61d32de97f92a6c0..8280e8edfc496f014029d3abcb25560c5c89f100 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -667,8 +667,8 @@ xml_set_wimboot(struct wim_xml_info *info, int image)
 }
 
 /*
- * Calculate what to put in the FILECOUNT, DIRCOUNT, TOTALBYTES, and
- * HARDLINKBYTES elements of the specified WIM image.
+ * Update the DIRCOUNT, FILECOUNT, TOTALBYTES, HARDLINKBYTES, and
+ * LASTMODIFICATIONTIME elements for 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.
@@ -684,8 +684,8 @@ xml_update_image_info(WIMStruct *wim, int image)
        u64 total_bytes = 0;
        u64 hard_link_bytes = 0;
        u64 size;
-       xmlNode *filecount_node;
        xmlNode *dircount_node;
+       xmlNode *filecount_node;
        xmlNode *totalbytes_node;
        xmlNode *hardlinkbytes_node;
        xmlNode *lastmodificationtime_node;
@@ -716,7 +716,6 @@ xml_update_image_info(WIMStruct *wim, int image)
                xmlFreeNode(totalbytes_node);
                xmlFreeNode(hardlinkbytes_node);
                xmlFreeNode(lastmodificationtime_node);
-               WARNING("Failed to update image information!");
                return WIMLIB_ERR_NOMEM;
        }
 
@@ -773,9 +772,9 @@ err:
  * Make a copy of the XML information for the image with index @src_image in the
  * @src_info XML document and append it to the @dest_info XML document.
  *
- * In the process, the image's name and description will be changed to the
- * values specified by @dest_image_name and @dest_image_description.  Either or
- * both may be NULL, which indicates that the corresponding element will not be
+ * In the process, change the image's name and description to the values
+ * specified by @dest_image_name and @dest_image_description.  Either or both
+ * may be NULL, which indicates that the corresponding element will not be
  * included in the destination image.
  */
 int
@@ -809,7 +808,10 @@ xml_export_image(const struct wim_xml_info *src_info, int src_image,
 
        xmlFreeProp(unlink_index_attribute(dest_node));
 
-       return append_image_node(dest_info, dest_node);
+       ret = append_image_node(dest_info, dest_node);
+       if (ret)
+               goto err;
+       return 0;
 
 err:
        xmlFreeNode(dest_node);
@@ -920,11 +922,12 @@ print_windows_info(struct wim_xml_info *info, xmlNode *image_node)
 
                tprintf(T("Languages:              "));
                node_for_each_child(langs_node, lang_node) {
-                       if (node_is_element(lang_node, "LANGUAGE")) {
-                               tfputs(node_get_ttext(info, lang_node), stdout);
-                               tputchar(T(' '));
-                       }
-
+                       if (!node_is_element(lang_node, "LANGUAGE"))
+                               continue;
+                       text = node_get_ttext(info, lang_node);
+                       if (!text)
+                               continue;
+                       tprintf(T("%"TS" "), text);
                }
                tputchar(T('\n'));
 
@@ -1016,10 +1019,11 @@ xml_print_image_info(struct wim_xml_info *info, int image)
  *                      Reading and writing the XML data                      *
  *----------------------------------------------------------------------------*/
 
-static unsigned
+static int
 image_node_get_index(const xmlNode *node)
 {
-       return node_get_number((const xmlNode *)xmlHasProp(node, "INDEX"), 10);
+       u64 v = node_get_number((const xmlNode *)xmlHasProp(node, "INDEX"), 10);
+       return min(v, INT_MAX);
 }
 
 /* Prepare the 'images' array from the XML document tree.  */
@@ -1027,8 +1031,8 @@ static int
 setup_images(struct wim_xml_info *info, xmlNode *root)
 {
        xmlNode *child;
-       unsigned index;
-       unsigned max_index = 0;
+       int index;
+       int max_index = 0;
        int ret;
 
        info->images = NULL;
@@ -1346,8 +1350,8 @@ wimlib_extract_xml_data(WIMStruct *wim, FILE *fp)
        return ret;
 }
 
-WIMLIBAPI bool
-wimlib_image_name_in_use(const WIMStruct *wim, const tchar *name)
+static bool
+image_name_in_use(const WIMStruct *wim, const tchar *name, int excluded_image)
 {
        const struct wim_xml_info *info = wim->xml_info;
        const xmlChar *name_utf8;
@@ -1361,6 +1365,8 @@ wimlib_image_name_in_use(const WIMStruct *wim, const tchar *name)
        if (tstr_get_utf8(name, &name_utf8))
                return false;
        for (int i = 0; i < info->image_count && !found; i++) {
+               if (i + 1 == excluded_image)
+                       continue;
                found = xmlStrEqual(name_utf8, xml_get_text_by_path(
                                                    info->images[i], "NAME"));
        }
@@ -1368,6 +1374,12 @@ wimlib_image_name_in_use(const WIMStruct *wim, const tchar *name)
        return found;
 }
 
+WIMLIBAPI bool
+wimlib_image_name_in_use(const WIMStruct *wim, const tchar *name)
+{
+       return image_name_in_use(wim, name, WIMLIB_NO_IMAGE);
+}
+
 WIMLIBAPI const tchar *
 wimlib_get_image_name(const WIMStruct *wim, int image)
 {
@@ -1387,6 +1399,8 @@ wimlib_get_image_property(const WIMStruct *wim, int image,
        const xmlChar *name;
        const tchar *value;
 
+       if (!property_name || !*property_name)
+               return NULL;
        if (tstr_get_utf8(property_name, &name))
                return NULL;
        value = get_image_property(wim, image, name, NULL);
@@ -1397,7 +1411,7 @@ wimlib_get_image_property(const WIMStruct *wim, int image,
 WIMLIBAPI int
 wimlib_set_image_name(WIMStruct *wim, int image, const tchar *name)
 {
-       if (wimlib_image_name_in_use(wim, name))
+       if (image_name_in_use(wim, name, image))
                return WIMLIB_ERR_IMAGE_NAME_COLLISION;
 
        return set_image_property(wim, image, "NAME", name);
@@ -1422,6 +1436,9 @@ wimlib_set_image_property(WIMStruct *wim, int image, const tchar *property_name,
        const xmlChar *name;
        int ret;
 
+       if (!property_name || !*property_name)
+               return WIMLIB_ERR_INVALID_PARAM;
+
        ret = tstr_get_utf8(property_name, &name);
        if (ret)
                return ret;