xml.c: support numerically indexed elements in wimlib_{get,set}_image_property()

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index e29030c69b59b4f199ebcf876cc4cfaf330d3ab3..d46470653ab4149d15fa5dfef347844034e32363 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -342,6 +342,32 @@ alloc_wim_xml_info(void)
        return info;
 }
 
+static bool
+parse_index(xmlChar **pp, uint32_t *index_ret)
+{
+       xmlChar *p = *pp;
+       uint32_t index = 0;
+
+       *p++ = '\0'; /* overwrite '[' */
+       while (*p >= '0' && *p <= '9') {
+               uint32_t n = (index * 10) + (*p++ - '0');
+               if (n < index)
+                       return false;
+               index = n;
+       }
+       if (index == 0)
+               return false;
+       if (*p != ']')
+               return false;
+       p++;
+       if (*p != '/' && *p != '\0')
+               return false;
+
+       *pp = p;
+       *index_ret = index;
+       return true;
+}
+
 static int
 do_xml_path_walk(xmlNode *node, const xmlChar *path, bool create,
                 xmlNode **result_ret)
@@ -362,34 +388,44 @@ do_xml_path_walk(xmlNode *node, const xmlChar *path, bool create,
 
        if (*p == '/')
                goto bad_syntax;
-       if (strchr(p, '[')) /* reserved for future use */
-               goto bad_syntax;
        c = *p;
 
        while (c != '\0') {
                const xmlChar *name;
                xmlNode *child;
+               uint32_t index = 1;
 
                /* We have another path component.  */
 
                /* Parse the element name.  */
                name = p;
-               while (*p != '/' && *p != '\0')
+               while (*p != '/' && *p != '\0' && *p != '[')
                        p++;
                if (p == name) /* empty name?  */
                        goto bad_syntax;
+
+               /* Handle a bracketed index, if one was specified.  */
+               if (*p == '[' && !parse_index(&p, &index))
+                       goto bad_syntax;
+
                c = *p;
                *p = '\0';
 
                /* Look for a matching child.  */
                node_for_each_child(node, child)
-                       if (node_is_element(child, name))
+                       if (node_is_element(child, name) && !--index)
                                goto next_step;
 
                /* No child matched the path.  If create=false, the lookup
                 * failed.  If create=true, create the needed element.  */
                if (!create)
                        return 0;
+
+               /* We can't create an element at index 'n' if indices 1...n-1
+                * didn't already exist.  */
+               if (index != 1)
+                       return WIMLIB_ERR_INVALID_PARAM;
+
                child = xmlNewChild(node, NULL, name, NULL);
                if (!child)
                        return WIMLIB_ERR_NOMEM;
@@ -716,7 +752,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;
        }
 
@@ -809,7 +844,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 +958,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'));
 
@@ -1347,8 +1386,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;
@@ -1362,6 +1401,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"));
        }
@@ -1369,6 +1410,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)
 {
@@ -1388,6 +1435,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);
@@ -1398,7 +1447,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);
@@ -1423,6 +1472,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;