X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fupdate_image.c;h=b6fb67c095d23c670a8a3b590ac27e1b1c2b8716;hp=15458a12b51593984d00637d701abad8d13fe377;hb=90f1e04a2a143876a4413577b25db60b5ba0fe97;hpb=52c44c6a506cdfae17fd5fd5c6611622d342c128

diff --git a/src/update_image.c b/src/update_image.c
index 15458a12..b6fb67c0 100644
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -56,7 +56,6 @@
 #include "wimlib/alloca.h"
 #include "wimlib/assert.h"
 #include "wimlib/blob_table.h"
-#include "wimlib/capture.h"
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
 #include "wimlib/endianness.h"
@@ -64,6 +63,9 @@
 #include "wimlib/metadata.h"
 #include "wimlib/paths.h"
 #include "wimlib/progress.h"
+#include "wimlib/scan.h"
+#include "wimlib/test_support.h"
+#include "wimlib/xml_windows.h"
 
 /* Saved specification of a "primitive" update operation that was performed.  */
 struct update_primitive {
@@ -785,9 +787,9 @@ execute_add_command(struct update_command_journal *j,
 	tchar *fs_source_path;
 	tchar *wim_target_path;
 	const tchar *config_file;
-	struct capture_params params;
+	struct scan_params params;
 	struct capture_config config;
-	capture_tree_t capture_tree = platform_default_capture_tree;
+	scan_tree_t scan_tree = platform_default_scan_tree;
 	struct wim_dentry *branch;
 
 	add_flags = add_cmd->add.add_flags;
@@ -799,7 +801,12 @@ execute_add_command(struct update_command_journal *j,
 
 #ifdef WITH_NTFS_3G
 	if (add_flags & WIMLIB_ADD_FLAG_NTFS)
-		capture_tree = ntfs_3g_build_dentry_tree;
+		scan_tree = ntfs_3g_build_dentry_tree;
+#endif
+
+#ifdef ENABLE_TEST_SUPPORT
+	if (add_flags & WIMLIB_ADD_FLAG_GENERATE_TEST_DATA)
+		scan_tree = generate_dentry_tree;
 #endif
 
 	ret = get_capture_config(config_file, &config,
@@ -825,7 +832,7 @@ execute_add_command(struct update_command_journal *j,
 
 	if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path))
 		params.add_flags |= WIMLIB_ADD_FLAG_ROOT;
-	ret = (*capture_tree)(&branch, fs_source_path, &params);
+	ret = (*scan_tree)(&branch, fs_source_path, &params);
 	if (ret)
 		goto out_destroy_config;
 
@@ -860,7 +867,7 @@ execute_add_command(struct update_command_journal *j,
 		/* If a capture configuration file was explicitly specified when
 		 * capturing an image in WIMBoot mode, save it as
 		 * /Windows/System32/WimBootCompress.ini in the WIM image. */
-		ret = platform_default_capture_tree(&branch, config_file, &params);
+		ret = platform_default_scan_tree(&branch, config_file, &params);
 		if (ret)
 			goto out_destroy_config;
 
@@ -869,6 +876,12 @@ execute_add_command(struct update_command_journal *j,
 			goto out_destroy_config;
 	}
 
+	if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path)) {
+		ret = set_windows_specific_info(wim);
+		if (ret)
+			goto out_destroy_config;
+	}
+
 	ret = 0;
 out_destroy_config:
 	destroy_capture_config(&config);
@@ -1088,7 +1101,7 @@ execute_update_commands(WIMStruct *wim,
 		inode_table = alloca(sizeof(struct wim_inode_table));
 		sd_set = alloca(sizeof(struct wim_sd_set));
 
-		ret = init_inode_table(inode_table, 9001);
+		ret = init_inode_table(inode_table, 64);
 		if (ret)
 			goto out;
 
@@ -1197,21 +1210,26 @@ 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 |
+		#ifdef ENABLE_TEST_SUPPORT
+			  WIMLIB_ADD_FLAG_GENERATE_TEST_DATA |
+		#endif
+			  WIMLIB_ADD_FLAG_FILE_PATHS_UNNEEDED))
 		return WIMLIB_ERR_INVALID_PARAM;
 
 	bool is_entire_image = WIMLIB_IS_WIM_ROOT_PATH(cmd->add.wim_target_path);
 
 #ifndef WITH_NTFS_3G
 	if (add_flags & WIMLIB_ADD_FLAG_NTFS) {
-		ERROR("NTFS-3g capture mode is unsupported because wimlib "
+		ERROR("NTFS-3G capture mode is unsupported because wimlib "
 		      "was compiled --without-ntfs-3g");
 		return WIMLIB_ERR_UNSUPPORTED;
 	}
 #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;
@@ -1220,6 +1238,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, where it uses VSS.");
+		return WIMLIB_ERR_UNSUPPORTED;
+	}
 #endif
 
 	/* VERBOSE implies EXCLUDE_VERBOSE */