License and documentation

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index 1c20847955c36d06e9c3f79de4356c9c9c0059d5..2f67c9851fcc8fe331a3c425cadee3e3d8dba2c7 100644 (file)
--- 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/.
  */
 
@@ -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);
 
@@ -981,16 +977,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 +1007,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 +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 = 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);
 
-               printf("Creation Time:          %s", asctime(localtime(&ctime)));
-               printf("Last Modification Time: %s", asctime(localtime(&mtime)));
+               time = wim_timestamp_to_unix(image_info->last_modification_time);
+               p = asctime(gmtime(&time));
+               *(strrchr(p, '\n')) = '\0';
+
+               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)
@@ -1414,3 +1410,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;
+}