X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fupdate_image.c;h=2247a7f6840307751936b69f6ad618c30ecabf2a;hb=7a7beb822c6b1498cb94704d440d9c3ad8ee4aa2;hp=c24ee1947ba498b9edd0fe0284d4f4580840af14;hpb=fb38bf47c4be7488addb7f2767bb27ffc87e1ea3;p=wimlib

diff --git a/src/update_image.c b/src/update_image.c
index c24ee194..2247a7f6 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,8 @@
 #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.  */
@@ -715,6 +716,8 @@ static const char wincfg[] =
 "/swapfile.sys\n"
 "/System Volume Information\n"
 "/RECYCLER\n"
+"/$RECYCLE.BIN\n"
+"/$Recycle.Bin\n"
 "/Windows/CSC\n";
 
 static const tchar *wimboot_cfgfile =
@@ -786,9 +789,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;
@@ -800,7 +803,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,
@@ -826,7 +834,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;
 
@@ -861,7 +869,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;
 
@@ -880,6 +888,7 @@ execute_add_command(struct update_command_journal *j,
 out_destroy_config:
 	destroy_capture_config(&config);
 out:
+	FREE(params.cur_path);
 	return ret;
 }
 
@@ -1095,7 +1104,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;
 
@@ -1205,14 +1214,18 @@ check_add_command(struct wimlib_update_command *cmd,
 			  WIMLIB_ADD_FLAG_WIMBOOT |
 			  WIMLIB_ADD_FLAG_NO_REPLACE |
 			  WIMLIB_ADD_FLAG_TEST_FILE_EXCLUSION |
-			  WIMLIB_ADD_FLAG_SNAPSHOT))
+			  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;
 	}