Improve random number generation

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index 2b2c107b2cd2198ba40c222db43253eead799b7e..b6fb67c095d23c670a8a3b590ac27e1b1c2b8716 100644 (file)
--- 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,7 +63,9 @@
 #include "wimlib/metadata.h"
 #include "wimlib/paths.h"
 #include "wimlib/progress.h"
-#include "wimlib/xml.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 {
@@ -786,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;
@@ -800,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,
@@ -826,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;
 
@@ -861,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;
 
@@ -870,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);
@@ -1089,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;
 
@@ -1198,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;
@@ -1221,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 */
@@ -1396,6 +1422,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 +1431,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 +1446,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 +1459,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 +1467,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;
 }