X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fupdate_image.c;h=ac07b78ac8dbfe0c40eb338efafb97fb9e57f0d0;hp=03eb122edb693e9192c124839b7483603962f1ce;hb=542225070ab6583b6f5915172425cac6e0326d77;hpb=8214debe2f127bc6d56407c1fb4bee194af83478

diff --git a/src/update_image.c b/src/update_image.c
index 03eb122e..ac07b78a 100644
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -64,7 +64,7 @@
 #include "wimlib/metadata.h"
 #include "wimlib/paths.h"
 #include "wimlib/progress.h"
-#include "wimlib/xml.h"
+#include "wimlib/xml_windows.h"
 
 /* Saved specification of a "primitive" update operation that was performed.  */
 struct update_primitive {
@@ -689,7 +689,7 @@ attach_branch(struct wim_dentry *branch, const tchar *target_tstr,
 	if (ret)
 		goto out_free_branch;
 
-	BUILD_BUG_ON(WIM_PATH_SEPARATOR != OS_PREFERRED_PATH_SEPARATOR);
+	STATIC_ASSERT(WIM_PATH_SEPARATOR == OS_PREFERRED_PATH_SEPARATOR);
 	ret = dentry_set_name(branch, path_basename(target_tstr));
 	if (ret)
 		goto out_free_target;
@@ -870,6 +870,14 @@ execute_add_command(struct update_command_journal *j,
 			goto out_destroy_config;
 	}
 
+	if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path) &&
+	    get_dentry(wim, T("Windows"), WIMLIB_CASE_INSENSITIVE))
+	{
+		ret = set_windows_specific_info(wim);
+		if (ret)
+			goto out_destroy_config;
+	}
+
 	ret = 0;
 out_destroy_config:
 	destroy_capture_config(&config);
@@ -1198,7 +1206,8 @@ check_add_command(struct wimlib_update_command *cmd,
 			  WIMLIB_ADD_FLAG_WINCONFIG |
 			  WIMLIB_ADD_FLAG_WIMBOOT |
 			  WIMLIB_ADD_FLAG_NO_REPLACE |
-			  WIMLIB_ADD_FLAG_TEST_FILE_EXCLUSION))
+			  WIMLIB_ADD_FLAG_TEST_FILE_EXCLUSION |
+			  WIMLIB_ADD_FLAG_SNAPSHOT))
 		return WIMLIB_ERR_INVALID_PARAM;
 
 	bool is_entire_image = WIMLIB_IS_WIM_ROOT_PATH(cmd->add.wim_target_path);
@@ -1212,7 +1221,7 @@ check_add_command(struct wimlib_update_command *cmd,
 #endif
 
 #ifdef __WIN32__
-	/* Check for flags not supported on Windows */
+	/* Check for flags not supported on Windows.  */
 	if (add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
 		ERROR("Capturing UNIX-specific data is not supported on Windows");
 		return WIMLIB_ERR_UNSUPPORTED;
@@ -1221,6 +1230,15 @@ check_add_command(struct wimlib_update_command *cmd,
 		ERROR("Dereferencing symbolic links is not supported on Windows");
 		return WIMLIB_ERR_UNSUPPORTED;
 	}
+#else
+	/* Check for flags only supported on Windows.  */
+
+	/* Currently, SNAPSHOT means Windows VSS.  In the future, it perhaps
+	 * could be implemented for other types of snapshots, such as btrfs.  */
+	if (add_flags & WIMLIB_ADD_FLAG_SNAPSHOT) {
+		ERROR("Snapshot mode is only supported on Windows (VSS)");
+		return WIMLIB_ERR_UNSUPPORTED;
+	}
 #endif
 
 	/* VERBOSE implies EXCLUDE_VERBOSE */
@@ -1396,6 +1414,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 +1423,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 +1438,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 +1451,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 +1459,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;
 }