Delay xml_update_image_info() until write

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index 2b2c107b2cd2198ba40c222db43253eead799b7e..15458a12b51593984d00637d701abad8d13fe377 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -64,7 +64,6 @@
 #include "wimlib/metadata.h"
 #include "wimlib/paths.h"
 #include "wimlib/progress.h"
-#include "wimlib/xml.h"
 
 /* Saved specification of a "primitive" update operation that was performed.  */
 struct update_primitive {
@@ -1396,6 +1395,7 @@ wimlib_update_image(WIMStruct *wim,
                    int update_flags)
 {
        int ret;
+       struct wim_image_metadata *imd;
        struct wimlib_update_command *cmds_copy;
 
        if (update_flags & ~WIMLIB_UPDATE_FLAG_SEND_PROGRESS)
@@ -1404,7 +1404,14 @@ wimlib_update_image(WIMStruct *wim,
        /* Load the metadata for the image to modify (if not loaded already) */
        ret = select_wim_image(wim, image);
        if (ret)
-               goto out;
+               return ret;
+
+       imd = wim->image_metadata[image - 1];
+
+       /* Don't allow updating an image currently being shared by multiple
+        * WIMStructs (as a result of an export)  */
+       if (imd->refcnt > 1)
+               return WIMLIB_ERR_IMAGE_HAS_MULTIPLE_REFERENCES;
 
        /* Make a copy of the update commands, in the process doing certain
         * canonicalizations on paths (e.g. translating backslashes to forward
@@ -1412,7 +1419,7 @@ wimlib_update_image(WIMStruct *wim,
         * commands. */
        ret = copy_update_commands(cmds, num_cmds, &cmds_copy);
        if (ret)
-               goto out;
+               return ret;
 
        /* Perform additional checks on the update commands before we execute
         * them. */
@@ -1425,12 +1432,7 @@ wimlib_update_image(WIMStruct *wim,
        if (ret)
                goto out_free_cmds_copy;
 
-       wim->image_metadata[image - 1]->modified = 1;
-
-       /* Statistics about the WIM image, such as the numbers of files and
-        * directories, may have changed.  Call xml_update_image_info() to
-        * recalculate these statistics. */
-       xml_update_image_info(wim, image);
+       mark_image_dirty(imd);
 
        for (size_t i = 0; i < num_cmds; i++)
                if (cmds_copy[i].op == WIMLIB_UPDATE_OP_ADD &&
@@ -1438,7 +1440,6 @@ wimlib_update_image(WIMStruct *wim,
                        wim->hdr.flags |= WIM_HDR_FLAG_RP_FIX;
 out_free_cmds_copy:
        free_update_commands(cmds_copy, num_cmds);
-out:
        return ret;
 }