}
/*
- * 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.
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;
xmlFreeNode(totalbytes_node);
xmlFreeNode(hardlinkbytes_node);
xmlFreeNode(lastmodificationtime_node);
- WARNING("Failed to update image information!");
return WIMLIB_ERR_NOMEM;
}
* 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
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);
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'));
* 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. */
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;
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;
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"));
}
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)
{
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);
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);
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;