update_image.c: Ignore Windows 10 Recycle Bin directories.

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index 8551b5f639200cbac21cf3b9ca0080909ef85f23..334db3862e526ec2294b9d636fe3a58aad5a2992 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -64,6 +64,7 @@
 #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 =
@@ -803,6 +806,11 @@ execute_add_command(struct update_command_journal *j,
                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,
                                 add_flags, fs_source_path);
        if (ret)
@@ -1206,6 +1214,9 @@ check_add_command(struct wimlib_update_command *cmd,
                          WIMLIB_ADD_FLAG_NO_REPLACE |
                          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;
 
@@ -1213,7 +1224,7 @@ check_add_command(struct wimlib_update_command *cmd,
 
 #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;
        }