};
struct windows_info {
- u64 arch;
- utf8char *product_name;
- utf8char *edition_id;
- utf8char *installation_type;
- utf8char *hal;
- utf8char *product_type;
- utf8char *product_suite;
- utf8char **languages;
- utf8char *default_language;
- size_t num_languages;
- utf8char *system_root;
- bool windows_version_exists;
- struct windows_version windows_version;
+ u64 arch;
+ tchar *product_name;
+ tchar *edition_id;
+ tchar *installation_type;
+ tchar *hal;
+ tchar *product_type;
+ tchar *product_suite;
+ tchar **languages;
+ tchar *default_language;
+ size_t num_languages;
+ tchar *system_root;
+ bool windows_version_exists;
+ struct windows_version windows_version;
};
struct image_info {
u64 creation_time;
u64 last_modification_time;
struct windows_info windows_info;
- utf8char *name;
- utf8char *description;
- utf8char *display_name;
- utf8char *display_description;
- union {
- utf8char *flags;
- struct wim_lookup_table *lookup_table;
- };
+ tchar *name;
+ tchar *description;
+ tchar *display_name;
+ tchar *display_description;
+ tchar *flags;
};
+struct xml_string_spec {
+ const char *name;
+ size_t offset;
+};
+
+#define ELEM(STRING_NAME, MEMBER_NAME) \
+ {STRING_NAME, offsetof(struct image_info, MEMBER_NAME)}
+static const struct xml_string_spec
+image_info_xml_string_specs[] = {
+ ELEM("NAME", name),
+ ELEM("DESCRIPTION", description),
+ ELEM("DISPLAYNAME", display_name),
+ ELEM("DISPLAYDESCRIPTION", display_description),
+ ELEM("FLAGS", flags),
+};
+#undef ELEM
+
+#define ELEM(STRING_NAME, MEMBER_NAME) \
+ {STRING_NAME, offsetof(struct windows_info, MEMBER_NAME)}
+static const struct xml_string_spec
+windows_info_xml_string_specs[] = {
+ ELEM("PRODUCTNAME", product_name),
+ ELEM("EDITIONID", edition_id),
+ ELEM("INSTALLATIONTYPE", installation_type),
+ ELEM("HAL", hal),
+ ELEM("PRODUCTTYPE", product_type),
+ ELEM("PRODUCTSUITE", product_suite),
+};
+#undef ELEM
+
/* Returns a statically allocated string that is a string representation of the
* architecture number. */
-static const char *
+static const tchar *
get_arch(int arch)
{
switch (arch) {
case 0:
- return "x86";
+ return T("x86");
case 6:
- return "ia64";
+ return T("ia64");
case 9:
- return "x86_64";
+ return T("x86_64");
/* XXX Are there other arch values? */
default:
- return NULL;
+ return T("unknown");
}
}
}
static inline bool
-node_name_is(xmlNode *node, const utf8char *name)
+node_name_is(xmlNode *node, const char *name)
{
/* For now, both upper case and lower case element names are accepted. */
return strcasecmp((const char *)node->name, name) == 0;
}
-/* Finds the text node that is a child of an element node and returns its
- * content converted to a 64-bit unsigned integer. Returns 0 if no text node is
- * found. */
static u64
-node_get_u64(const xmlNode *u64_node)
+node_get_number(const xmlNode *u64_node, int base)
{
xmlNode *child;
for_node_child(u64_node, child)
if (node_is_text(child))
- return strtoull((const char *)child->content, NULL, 10);
+ return strtoull(child->content, NULL, base);
return 0;
}
+/* Finds the text node that is a child of an element node and returns its
+ * content converted to a 64-bit unsigned integer. Returns 0 if no text node is
+ * found. */
+static u64
+node_get_u64(const xmlNode *u64_node)
+{
+ return node_get_number(u64_node, 10);
+}
+
/* Like node_get_u64(), but expects a number in base 16. */
static u64
node_get_hex_u64(const xmlNode *u64_node)
{
- xmlNode *child;
- for_node_child(u64_node, child)
- if (node_is_text(child))
- return strtoull(child->content, NULL, 16);
- return 0;
+ return node_get_number(u64_node, 16);
}
static int
-node_get_string(const xmlNode *string_node, utf8char **str)
+node_get_string(const xmlNode *string_node, tchar **tstr_ret)
{
xmlNode *child;
- char *p = NULL;
+ tchar *tstr = NULL;
+ int ret;
for_node_child(string_node, child) {
if (node_is_text(child) && child->content) {
- p = STRDUP(child->content);
- if (!p)
- return WIMLIB_ERR_NOMEM;
+ ret = utf8_to_tstr_simple(child->content, &tstr);
+ if (ret)
+ return ret;
break;
}
}
- *str = p;
+ *tstr_ret = tstr;
return 0;
}
* */
static int
xml_read_languages(const xmlNode *languages_node,
- utf8char ***languages_ret,
+ tchar ***languages_ret,
size_t *num_languages_ret,
- utf8char **default_language_ret)
+ tchar **default_language_ret)
{
xmlNode *child;
size_t num_languages = 0;
- utf8char **languages;
+ tchar **languages;
int ret;
for_node_child(languages_node, child)
return ret;
}
if (!image_info->name) {
- utf8char *empty_name;
+ tchar *empty_name;
WARNING("Image with index %d has no name", image_info->index);
- empty_name = MALLOC(1);
+ empty_name = TMALLOC(1);
if (!empty_name)
return WIMLIB_ERR_NOMEM;
- *empty_name = '\0';
+ *empty_name = T('\0');
image_info->name = empty_name;
}
return ret;
return ret;
}
-/* Prints the information contained in a `struct windows_info'.
+/* Prints the information contained in a `struct windows_info'.
*
* Warning: any strings printed here are in UTF-8 encoding. If the locale
* character encoding is not UTF-8, the printed strings may be garbled. */
{
const struct windows_version *windows_version;
- wimlib_printf("Architecture: %s\n",
- get_arch(windows_info->arch) ?: "unknown");
+ tprintf(T("Architecture: %"TS"\n"),
+ get_arch(windows_info->arch));
- if (windows_info->product_name)
- wimlib_printf("Product Name: %U\n",
- windows_info->product_name);
+ if (windows_info->product_name) {
+ tprintf(T("Product Name: %"TS"\n"),
+ windows_info->product_name);
+ }
- if (windows_info->edition_id)
- wimlib_printf("Edition ID: %U\n",
- windows_info->edition_id);
+ if (windows_info->edition_id) {
+ tprintf(T("Edition ID: %"TS"\n"),
+ windows_info->edition_id);
+ }
- if (windows_info->installation_type)
- wimlib_printf("Installation Type: %U\n",
- windows_info->installation_type);
+ if (windows_info->installation_type) {
+ tprintf(T("Installation Type: %"TS"\n"),
+ windows_info->installation_type);
+ }
- if (windows_info->hal)
- wimlib_printf("HAL: %U\n",
+ if (windows_info->hal) {
+ tprintf(T("HAL: %"TS"\n"),
windows_info->hal);
+ }
- if (windows_info->product_type)
- wimlib_printf("Product Type: %U\n",
- windows_info->product_type);
+ if (windows_info->product_type) {
+ tprintf(T("Product Type: %"TS"\n"),
+ windows_info->product_type);
+ }
- if (windows_info->product_suite)
- wimlib_printf("Product Suite: %U\n",
- windows_info->product_suite);
+ if (windows_info->product_suite) {
+ tprintf(T("Product Suite: %"TS"\n"),
+ windows_info->product_suite);
+ }
- printf("Languages: ");
+ tprintf(T("Languages: "));
for (size_t i = 0; i < windows_info->num_languages; i++) {
- wimlib_printf("%U", windows_info->languages[i]);
- putchar(' ');
+
+ tfputs(windows_info->languages[i], stdout);
+ tputchar(T(' '));
+ }
+ tputchar(T('\n'));
+ if (windows_info->default_language) {
+ tprintf(T("Default Language: %"TS"\n"),
+ windows_info->default_language);
}
- putchar('\n');
- if (windows_info->default_language)
- wimlib_printf("Default Language: %U\n",
- windows_info->default_language);
- if (windows_info->system_root)
- wimlib_printf("System Root: %U\n",
+ if (windows_info->system_root) {
+ tprintf(T("System Root: %"TS"\n"),
windows_info->system_root);
+ }
+
if (windows_info->windows_version_exists) {
windows_version = &windows_info->windows_version;
- printf("Major Version: %"PRIu64"\n",
- windows_version->major);
- printf("Minor Version: %"PRIu64"\n",
- windows_version->minor);
- printf("Build: %"PRIu64"\n",
- windows_version->build);
- printf("Service Pack Build: %"PRIu64"\n",
- windows_version->sp_build);
- printf("Service Pack Level: %"PRIu64"\n",
- windows_version->sp_level);
+ tprintf(T("Major Version: %"PRIu64"\n"),
+ windows_version->major);
+ tprintf(T("Minor Version: %"PRIu64"\n"),
+ windows_version->minor);
+ tprintf(T("Build: %"PRIu64"\n"),
+ windows_version->build);
+ tprintf(T("Service Pack Build: %"PRIu64"\n"),
+ windows_version->sp_build);
+ tprintf(T("Service Pack Level: %"PRIu64"\n"),
+ windows_version->sp_level);
}
}
+static int
+xml_write_string(xmlTextWriter *writer, const char *name,
+ const tchar *tstr)
+{
+ if (tstr) {
+ char *utf8_str;
+ int rc = tstr_to_utf8_simple(tstr, &utf8_str);
+ if (rc)
+ return rc;
+ rc = xmlTextWriterWriteElement(writer, name, utf8_str);
+ FREE(utf8_str);
+ if (rc < 0)
+ return rc;
+ }
+ return 0;
+}
+
+static int
+xml_write_strings_from_specs(xmlTextWriter *writer,
+ const void *struct_with_strings,
+ const struct xml_string_spec specs[],
+ size_t num_specs)
+{
+ for (size_t i = 0; i < num_specs; i++) {
+ int rc = xml_write_string(writer, specs[i].name,
+ *(const tchar * const *)
+ (struct_with_strings + specs[i].offset));
+ if (rc)
+ return rc;
+ }
+ return 0;
+}
+
+static int
+dup_strings_from_specs(const void *old_struct_with_strings,
+ void *new_struct_with_strings,
+ const struct xml_string_spec specs[],
+ size_t num_specs)
+{
+ for (size_t i = 0; i < num_specs; i++) {
+ const tchar *old_str = *(const tchar * const *)
+ ((const void*)old_struct_with_strings + specs[i].offset);
+ tchar **new_str_p = (tchar **)((void*)new_struct_with_strings + specs[i].offset);
+ if (old_str) {
+ *new_str_p = TSTRDUP(old_str);
+ if (!*new_str_p)
+ return WIMLIB_ERR_NOMEM;
+ }
+ }
+ return 0;
+}
/* Writes the information contained in a `struct windows_version' to the XML
* document being written. This is the <VERSION> element inside the <WINDOWS>
if (rc < 0)
return rc;
- if (windows_info->product_name) {
- rc = xmlTextWriterWriteElement(writer, "PRODUCTNAME",
- windows_info->product_name);
- if (rc < 0)
- return rc;
- }
-
- if (windows_info->edition_id) {
- rc = xmlTextWriterWriteElement(writer, "EDITIONID",
- windows_info->edition_id);
- if (rc < 0)
- return rc;
- }
-
- if (windows_info->installation_type) {
- rc = xmlTextWriterWriteElement(writer, "INSTALLATIONTYPE",
- windows_info->installation_type);
- if (rc < 0)
- return rc;
- }
-
- if (windows_info->hal) {
- rc = xmlTextWriterWriteElement(writer, "HAL",
- windows_info->hal);
- if (rc < 0)
- return rc;
- }
-
- if (windows_info->product_type) {
- rc = xmlTextWriterWriteElement(writer, "PRODUCTTYPE",
- windows_info->product_type);
- if (rc < 0)
- return rc;
- }
-
- if (windows_info->product_suite) {
- rc = xmlTextWriterWriteElement(writer, "PRODUCTSUITE",
- windows_info->product_suite);
- if (rc < 0)
- return rc;
- }
+ rc = xml_write_strings_from_specs(writer,
+ windows_info,
+ windows_info_xml_string_specs,
+ ARRAY_LEN(windows_info_xml_string_specs));
+ if (rc)
+ return rc;
if (windows_info->num_languages) {
rc = xmlTextWriterStartElement(writer, "LANGUAGES");
return rc;
for (size_t i = 0; i < windows_info->num_languages; i++) {
- rc = xmlTextWriterWriteElement(writer, "LANGUAGE",
- windows_info->languages[i]);
- if (rc < 0)
+ rc = xml_write_string(writer, "LANGUAGE",
+ windows_info->languages[i]);
+ if (rc)
return rc;
}
- rc = xmlTextWriterWriteElement(writer, "DEFAULT",
- windows_info->default_language);
- if (rc < 0)
+
+ rc = xml_write_string(writer, "DEFAULT",
+ windows_info->default_language);
+ if (rc)
return rc;
rc = xmlTextWriterEndElement(writer); /* </LANGUAGES> */
return rc;
}
- if (windows_info->system_root) {
- rc = xmlTextWriterWriteElement(writer, "SYSTEMROOT",
- windows_info->system_root);
- if (rc < 0)
- return rc;
- }
+ rc = xml_write_string(writer, "SYSTEMROOT",
+ windows_info->system_root);
+ if (rc)
+ return rc;
return xmlTextWriterEndElement(writer); /* </WINDOWS> */
}
/* Writes a time element to the XML document being constructed in memory. */
static int
-xml_write_time(xmlTextWriter *writer, const utf8char *element_name, u64 time)
+xml_write_time(xmlTextWriter *writer, const char *element_name, u64 time)
{
int rc;
rc = xmlTextWriterStartElement(writer, element_name);
if (image_info->windows_info_exists) {
rc = xml_write_windows_info(writer, &image_info->windows_info);
- if (rc < 0)
+ if (rc)
return rc;
}
- if (image_info->name) {
- rc = xmlTextWriterWriteElement(writer, "NAME",
- image_info->name);
- if (rc < 0)
- return rc;
- }
-
- if (image_info->description) {
- rc = xmlTextWriterWriteElement(writer, "DESCRIPTION",
- image_info->description);
- if (rc < 0)
- return rc;
- }
- if (image_info->display_name) {
- rc = xmlTextWriterWriteElement(writer, "DISPLAYNAME",
- image_info->display_name);
- if (rc < 0)
- return rc;
- }
- if (image_info->display_description) {
- rc = xmlTextWriterWriteElement(writer, "DISPLAYDESCRIPTION",
- image_info->display_description);
- if (rc < 0)
- return rc;
- }
-
- if (image_info->flags) {
- rc = xmlTextWriterWriteElement(writer, "FLAGS",
- image_info->flags);
- if (rc < 0)
- return rc;
- }
+ rc = xml_write_strings_from_specs(writer, image_info,
+ image_info_xml_string_specs,
+ ARRAY_LEN(image_info_xml_string_specs));
+ if (rc)
+ return rc;
- return xmlTextWriterEndElement(writer); /* </IMAGE> */
+ rc = xmlTextWriterEndElement(writer); /* </IMAGE> */
+ if (rc < 0)
+ return rc;
+ return 0;
}
static int
clone_windows_info(const struct windows_info *old, struct windows_info *new)
{
- if (old->product_name && !(new->product_name = STRDUP(old->product_name)))
- 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 =
- STRDUP(old->installation_type)))
- return WIMLIB_ERR_NOMEM;
- if (old->hal && !(new->hal = STRDUP(old->hal)))
- return WIMLIB_ERR_NOMEM;
- if (old->product_type && !(new->product_type = STRDUP(old->product_type)))
- return WIMLIB_ERR_NOMEM;
- if (old->product_suite && !(new->product_suite = STRDUP(old->product_suite)))
- return WIMLIB_ERR_NOMEM;
+ int ret;
+
+ ret = dup_strings_from_specs(old, new, windows_info_xml_string_specs,
+ ARRAY_LEN(windows_info_xml_string_specs));
+ if (ret)
+ return ret;
if (old->languages) {
new->languages = CALLOC(old->num_languages, sizeof(new->languages[0]));
for (size_t i = 0; i < new->num_languages; i++) {
if (!old->languages[i])
continue;
- new->languages[i] = STRDUP(old->languages[i]);
+ new->languages[i] = TSTRDUP(old->languages[i]);
if (!new->languages[i])
return WIMLIB_ERR_NOMEM;
}
}
if (old->default_language &&
- !(new->default_language = STRDUP(old->default_language)))
+ !(new->default_language = TSTRDUP(old->default_language)))
return WIMLIB_ERR_NOMEM;
- if (old->system_root && !(new->system_root = STRDUP(old->system_root)))
+ if (old->system_root && !(new->system_root = TSTRDUP(old->system_root)))
return WIMLIB_ERR_NOMEM;
if (old->windows_version_exists) {
new->windows_version_exists = true;
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;
new->creation_time = old->creation_time;
new->last_modification_time = old->last_modification_time;
- if (!(new->name = STRDUP(old->name)))
- return WIMLIB_ERR_NOMEM;
-
- if (old->description)
- if (!(new->description = STRDUP(old->description)))
- return WIMLIB_ERR_NOMEM;
-
- if (old->display_name)
- if (!(new->display_name = STRDUP(old->display_name)))
- return WIMLIB_ERR_NOMEM;
-
- if (old->display_description)
- if (!(new->display_description = STRDUP(old->display_description)))
- return WIMLIB_ERR_NOMEM;
-
- if (old->flags)
- if (!(new->flags = STRDUP(old->flags)))
- return WIMLIB_ERR_NOMEM;
+ ret = dup_strings_from_specs(old, new,
+ image_info_xml_string_specs,
+ ARRAY_LEN(image_info_xml_string_specs));
+ if (ret)
+ return ret;
if (old->windows_info_exists) {
new->windows_info_exists = true;
- return clone_windows_info(&old->windows_info,
- &new->windows_info);
+ ret = clone_windows_info(&old->windows_info,
+ &new->windows_info);
+ if (ret)
+ return ret;
}
return 0;
}
xml_export_image(const struct wim_info *old_wim_info,
int image,
struct wim_info **new_wim_info_p,
- const utf8char *dest_image_name,
- const utf8char *dest_image_description)
+ const tchar *dest_image_name,
+ const tchar *dest_image_description)
{
struct wim_info *new_wim_info;
struct image_info *image_info;
if (dest_image_name) {
FREE(image_info->name);
- image_info->name = STRDUP(dest_image_name);
+ image_info->name = TSTRDUP(dest_image_name);
if (!image_info->name)
goto err_destroy_image_info;
}
if (dest_image_description) {
FREE(image_info->description);
- image_info->description = STRDUP(dest_image_description);
+ image_info->description = TSTRDUP(dest_image_description);
if (!image_info->description)
goto err_destroy_image_info;
}
{
struct wim_info *wim_info;
- DEBUG("Deleting image %d from the XML data.", image);
-
wim_info = *wim_info_p;
+ wimlib_assert(image >= 1 && image <= wim_info->num_images);
+ DEBUG("Deleting image %d from the XML data.", image);
destroy_image_info(&wim_info->images[image - 1]);
{
size_t max_len = 0;
if (w->wim_info) {
- size_t len;
for (int i = 0; i < w->wim_info->num_images; i++) {
- len = strlen(w->wim_info->images[i].name);
+ size_t len = tstrlen(w->wim_info->images[i].name);
if (len > max_len)
max_len = len;
}
calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
{
struct image_info *info = arg;
- struct wim_lookup_table *lookup_table = info->lookup_table;
const struct wim_inode *inode = dentry->d_inode;
struct wim_lookup_table_entry *lte;
* 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);
+ lte = inode_unnamed_lte_resolved(inode);
if (lte) {
info->total_bytes += wim_resource_size(lte);
if (!dentry_is_first_in_inode(dentry))
if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) {
for (unsigned i = 0; i < inode->i_num_ads; i++) {
- if (inode->i_ads_entries[i].stream_name_len) {
- lte = inode_stream_lte(inode, i + 1, lookup_table);
+ if (inode->i_ads_entries[i].stream_name_nbytes) {
+ lte = inode_stream_lte_resolved(inode, i + 1);
if (lte) {
info->hard_link_bytes += inode->i_nlink *
wim_resource_size(lte);
xml_update_image_info(WIMStruct *w, int image)
{
struct image_info *image_info;
- utf8char *flags_save;
DEBUG("Updating the image info for image %d", image);
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,
+ for_dentry_in_tree(w->image_metadata[image - 1]->root_dentry,
calculate_dentry_statistics,
image_info);
- 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, const utf8char *name)
+xml_add_image(WIMStruct *w, const tchar *name)
{
struct wim_info *wim_info;
struct image_info *image_info;
if (!image_info)
goto out_free_wim_info;
- if (!(image_info->name = STRDUP(name)))
+ if (!(image_info->name = TSTRDUP(name)))
goto out_destroy_image_info;
w->wim_info = wim_info;
print_image_info(const struct wim_info *wim_info, int image)
{
const struct image_info *image_info;
- const char *desc;
- char buf[50];
+ const tchar *desc;
+ tchar buf[50];
wimlib_assert(image >= 1 && image <= wim_info->num_images);
image_info = &wim_info->images[image - 1];
- printf("Index: %d\n", image_info->index);
- wimlib_printf("Name: %U\n", image_info->name);
+ tprintf(T("Index: %d\n"), image_info->index);
+ tprintf(T("Name: %"TS"\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 = "";
- wimlib_printf("Description: %U\n", desc);
+ desc = T("");
+ tprintf(T("Description: %"TS"\n"), desc);
- if (image_info->display_name)
- wimlib_printf("Display Name: %U\n",
- image_info->display_name);
+ if (image_info->display_name) {
+ tprintf(T("Display Name: %"TS"\n"),
+ image_info->display_name);
+ }
- if (image_info->display_description)
- wimlib_printf("Display Description: %U\n",
- image_info->display_description);
+ if (image_info->display_description) {
+ tprintf(T("Display Description: %"TS"\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);
+ tprintf(T("Directory Count: %"PRIu64"\n"), image_info->dir_count);
+ tprintf(T("File Count: %"PRIu64"\n"), image_info->file_count);
+ tprintf(T("Total Bytes: %"PRIu64"\n"), image_info->total_bytes);
+ tprintf(T("Hard Link Bytes: %"PRIu64"\n"), image_info->hard_link_bytes);
wim_timestamp_to_str(image_info->creation_time, buf, sizeof(buf));
- printf("Creation Time: %s\n", buf);
+ tprintf(T("Creation Time: %"TS"\n"), buf);
wim_timestamp_to_str(image_info->creation_time, buf, sizeof(buf));
- printf("Last Modification Time: %s\n", buf);
+ tprintf(T("Last Modification Time: %"TS"\n"), buf);
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');
+ tprintf(T("Flags: %"TS"\n"), image_info->flags);
+ tputchar('\n');
}
void
* Reads the XML data from a WIM file.
*/
int
-read_xml_data(FILE *fp, const struct resource_entry *res_entry,
- utf16lechar **xml_data_ret, struct wim_info **info_ret)
+read_xml_data(int in_fd,
+ const struct resource_entry *res_entry,
+ struct wim_info **info_ret)
{
utf16lechar *xml_data;
xmlDoc *doc;
goto out;
}
- ret = read_uncompressed_resource(fp, res_entry->offset,
- res_entry->size, xml_data);
- if (ret != 0)
+ if (full_pread(in_fd, xml_data,
+ res_entry->size, res_entry->offset) != res_entry->size)
+ {
+ ERROR_WITH_ERRNO("Error reading XML data");
+ ret = WIMLIB_ERR_READ;
goto out_free_xml_data;
+ }
/* Null-terminate just in case */
((u8*)xml_data)[res_entry->size] = 0;
DEBUG("Parsing XML using libxml2 to create XML tree");
- doc = xmlReadMemory(xml_data, res_entry->size,
- "noname.xml", "UTF-16", 0);
+ doc = xmlReadMemory((const char *)xml_data,
+ res_entry->size, "noname.xml", "UTF-16", 0);
if (!doc) {
ERROR("Failed to parse XML data");
}
if (!node_is_element(root) || !node_name_is(root, "WIM")) {
- ERROR("Expected <WIM> for the root XML element (found <%s>)",
- root->name);
+ ERROR("Expected <WIM> for the root XML element");
ret = WIMLIB_ERR_XML;
goto out_free_doc;
}
-
ret = xml_read_wim_info(root, info_ret);
- if (ret != 0)
- goto out_free_doc;
-
- *xml_data_ret = xml_data;
- xml_data = NULL;
out_free_doc:
DEBUG("Freeing XML tree.");
xmlFreeDoc(doc);
* the offset of the XML data.
*/
int
-write_xml_data(const struct wim_info *wim_info, int image, FILE *out,
+write_xml_data(const struct wim_info *wim_info, int image, int out_fd,
u64 total_bytes, struct resource_entry *out_res_entry)
{
xmlCharEncodingHandler *encoding_handler;
(wim_info != NULL && image >= 1 &&
image <= wim_info->num_images));
- start_offset = ftello(out);
+ start_offset = filedes_offset(out_fd);
if (start_offset == -1)
return WIMLIB_ERR_WRITE;
/* 2 bytes endianness marker for UTF-16LE. This is _required_ for WIM
* XML data. */
- if ((putc(0xff, out)) == EOF || (putc(0xfe, out) == EOF)) {
+ static u8 bom[2] = {0xff, 0xfe};
+ if (full_write(out_fd, bom, 2) != 2) {
ERROR_WITH_ERRNO("Error writing XML data");
return WIMLIB_ERR_WRITE;
}
goto out;
}
- out_buffer = xmlOutputBufferCreateFile(out, encoding_handler);
+ out_buffer = xmlOutputBufferCreateFd(out_fd, encoding_handler);
if (!out_buffer) {
ERROR("Failed to allocate xmlOutputBuffer");
ret = WIMLIB_ERR_NOMEM;
DEBUG("Writing %d <IMAGE> elements", last - first + 1);
for (int i = first; i <= last; i++) {
ret = xml_write_image_info(writer, &wim_info->images[i - 1]);
- CHECK_RET;
+ if (ret) {
+ CHECK_RET;
+ goto out_free_text_writer;
+ }
}
}
DEBUG("Ended XML document");
- /* Call xmlFreeTextWriter() before ftello() because the former will
- * flush the file stream. */
- xmlFreeTextWriter(writer);
- writer = NULL;
-
- end_offset = ftello(out);
+ end_offset = filedes_offset(out_fd);
if (end_offset == -1) {
ret = WIMLIB_ERR_WRITE;
} else {
}
/* Returns the name of the specified image. */
-WIMLIBAPI const utf8char *
+WIMLIBAPI const tchar *
wimlib_get_image_name(const WIMStruct *w, int image)
{
if (image < 1 || image > w->hdr.image_count)
}
/* Returns the description of the specified image. */
-WIMLIBAPI const utf8char *
+WIMLIBAPI const tchar *
wimlib_get_image_description(const WIMStruct *w, int image)
{
if (image < 1 || image > w->hdr.image_count)
/* Determines if an image name is already used by some image in the WIM. */
WIMLIBAPI bool
-wimlib_image_name_in_use(const WIMStruct *w, const utf8char *name)
+wimlib_image_name_in_use(const WIMStruct *w, const tchar *name)
{
if (!name || !*name)
return false;
for (int i = 1; i <= w->hdr.image_count; i++)
- if (strcmp(w->wim_info->images[i - 1].name, name) == 0)
+ if (!tstrcmp(w->wim_info->images[i - 1].name, name))
return true;
return false;
}
+
/* Extracts the raw XML data to a file stream. */
WIMLIBAPI int
wimlib_extract_xml_data(WIMStruct *w, FILE *fp)
{
- size_t bytes_written;
+ size_t size;
+ void *buf;
+ int ret;
- if (!w->xml_data)
- return WIMLIB_ERR_INVALID_PARAM;
- bytes_written = fwrite(w->xml_data, 1, w->hdr.xml_res_entry.size, fp);
- if (bytes_written != w->hdr.xml_res_entry.size) {
+ size = w->hdr.xml_res_entry.size;
+ if (sizeof(size_t) < sizeof(u64))
+ if (size != w->hdr.xml_res_entry.size)
+ return WIMLIB_ERR_INVALID_PARAM;
+
+ buf = MALLOC(size);
+ if (!buf)
+ return WIMLIB_ERR_NOMEM;
+
+ if (full_pread(w->in_fd,
+ buf,
+ w->hdr.xml_res_entry.size,
+ w->hdr.xml_res_entry.offset) != w->hdr.xml_res_entry.size)
+ {
+ ERROR_WITH_ERRNO("Error reading XML data");
+ ret = WIMLIB_ERR_READ;
+ goto out_free_buf;
+ }
+
+ if (fwrite(buf, 1, size, fp) != size) {
ERROR_WITH_ERRNO("Failed to extract XML data");
- return WIMLIB_ERR_WRITE;
+ ret = WIMLIB_ERR_WRITE;
+ } else {
+ ret = 0;
}
- return 0;
+out_free_buf:
+ FREE(buf);
+ return ret;
}
/* Sets the name of an image in the WIM. */
WIMLIBAPI int
-wimlib_set_image_name(WIMStruct *w, int image, const utf8char *name)
+wimlib_set_image_name(WIMStruct *w, int image, const tchar *name)
{
- utf8char *p;
+ tchar *p;
int i;
- DEBUG("Setting the name of image %d to %s", image, name);
+ DEBUG("Setting the name of image %d to %"TS, image, name);
if (!name || !*name) {
ERROR("Must specify a non-empty string for the image name");
for (i = 1; i <= w->hdr.image_count; i++) {
if (i == image)
continue;
- if (strcmp(w->wim_info->images[i - 1].name, name) == 0) {
- ERROR("The name `%U' is already in use in the WIM!",
+ if (tstrcmp(w->wim_info->images[i - 1].name, name) == 0) {
+ ERROR("The name \"%"TS"\" is already in use in the WIM!",
name);
return WIMLIB_ERR_IMAGE_NAME_COLLISION;
}
}
- p = STRDUP(name);
+ p = TSTRDUP(name);
if (!p)
return WIMLIB_ERR_NOMEM;
return 0;
}
-/* Sets the description of an image in the WIM. */
-WIMLIBAPI int
-wimlib_set_image_descripton(WIMStruct *w, int image,
- const utf8char *description)
+static int
+do_set_image_info_str(WIMStruct *w, int image, const tchar *tstr,
+ size_t offset)
{
- utf8char *p;
+ tchar *tstr_copy;
+ tchar **dest_tstr_p;
if (image < 1 || image > w->hdr.image_count) {
ERROR("%d is not a valid image", image);
return WIMLIB_ERR_INVALID_IMAGE;
}
- if (description) {
- p = STRDUP(description);
- if (!p)
+ if (tstr) {
+ tstr_copy = TSTRDUP(tstr);
+ if (!tstr_copy)
return WIMLIB_ERR_NOMEM;
} else {
- p = NULL;
+ tstr_copy = NULL;
}
- FREE(w->wim_info->images[image - 1].description);
- w->wim_info->images[image - 1].description = p;
+ dest_tstr_p = (tchar**)((void*)&w->wim_info->images[image - 1] + offset);
+
+ FREE(*dest_tstr_p);
+ *dest_tstr_p = tstr_copy;
return 0;
}
-/* Set the <FLAGS> element of a WIM image */
+/* Sets the description of an image in the WIM. */
WIMLIBAPI int
-wimlib_set_image_flags(WIMStruct *w, int image, const utf8char *flags)
+wimlib_set_image_descripton(WIMStruct *w, int image,
+ const tchar *description)
{
- char *p;
+ return do_set_image_info_str(w, image, description,
+ offsetof(struct image_info, description));
+}
- 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)
- 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;
+/* Set the <FLAGS> element of a WIM image */
+WIMLIBAPI int
+wimlib_set_image_flags(WIMStruct *w, int image, const tchar *flags)
+{
+ return do_set_image_info_str(w, image, flags,
+ offsetof(struct image_info, flags));
}
git://wimlib.net / wimlib / blobdiff