X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fxml.c;h=73ba38e41f14b3f0be756048641d57610936098e;hb=f26dccb787fa4d83108dbb9d6843063ae262df3a;hp=77e58757bea26042b8364696a9d10ec17d1d06bd;hpb=6f7956a06fcf92a304fae93e393e8eaee34e92d5;p=wimlib diff --git a/src/xml.c b/src/xml.c index 77e58757..73ba38e4 100644 --- a/src/xml.c +++ b/src/xml.c @@ -10,16 +10,16 @@ * This file is part of wimlib, a library for working with WIM files. * * wimlib 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) + * 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. * * 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 Lesser General Public License for more + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -28,7 +28,7 @@ #include "xml.h" #include "timestamp.h" #include - +#include #include #include #include @@ -819,8 +819,6 @@ static int clone_windows_info(const struct windows_info *old, 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; @@ -869,8 +867,6 @@ 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.", image); @@ -977,20 +973,18 @@ void xml_update_image_info(WIMStruct *w, int image) &image_info->total_bytes, &image_info->hard_link_bytes); - image_info->last_modification_time = get_timestamp(); + 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, struct dentry *root_dentry, 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", - 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. */ @@ -1013,14 +1007,9 @@ int xml_add_image(WIMStruct *w, struct dentry *root_dentry, const char *name, if (!(image_info->name = STRDUP(name))) goto out_destroy_image_info; - if (description && !(image_info->description = STRDUP(description))) - goto out_destroy_image_info; - if (flags_element && !(image_info->flags = STRDUP(flags_element))) - goto out_destroy_image_info; - 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; @@ -1042,14 +1031,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; 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", @@ -1082,11 +1072,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 UTC\n", p); + + time = wim_timestamp_to_unix(image_info->last_modification_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("Last Modification Time: %s UTC\n", p); if (image_info->windows_info_exists) print_windows_info(&image_info->windows_info); if (image_info->flags) @@ -1112,23 +1108,22 @@ int read_xml_data(FILE *fp, const struct resource_entry *res, u8 **xml_data_ret, if (resource_is_compressed(res)) { 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"); 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; @@ -1141,7 +1136,7 @@ int read_xml_data(FILE *fp, const struct resource_entry *res, u8 **xml_data_ret, if (!doc) { 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."); @@ -1150,19 +1145,19 @@ int read_xml_data(FILE *fp, const struct resource_entry *res, u8 **xml_data_ret, if (!root) { 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>)", 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."); @@ -1170,11 +1165,11 @@ int read_xml_data(FILE *fp, const struct resource_entry *res, u8 **xml_data_ret, 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; } @@ -1361,6 +1356,9 @@ WIMLIBAPI int wimlib_set_image_name(WIMStruct *w, int image, const char *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"); return WIMLIB_ERR_INVALID_PARAM; @@ -1398,6 +1396,9 @@ WIMLIBAPI int wimlib_set_image_descripton(WIMStruct *w, int image, 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", image); return WIMLIB_ERR_INVALID_IMAGE; @@ -1415,3 +1416,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; +}