Timestamp printing UTC

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index 8132671a29dd6313ef2a680ff0f69584661efeae..943fb8340020c801084ebda14d8b9c7a60838dd6 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -981,16 +981,14 @@ void xml_update_image_info(WIMStruct *w, int image)
 }
 
 /* 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,11 +1011,6 @@ 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_wim_timestamp();
@@ -1042,14 +1035,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 +1076,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 = wim_timestamp_to_unix(image_info->creation_time);
-               mtime = wim_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 +1112,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 +1140,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 +1149,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 <WIM> 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 +1169,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;
 }
@@ -1415,3 +1414,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;
+}