X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fupdate_image.c;h=b6fb67c095d23c670a8a3b590ac27e1b1c2b8716;hp=c15a31b0fa3b40d810fc9f576db05c318c3111c7;hb=76689b1cac26c545260568997ae7fb949846f302;hpb=ee547cc83f231d727e4d9984c23e86d96d3da769 diff --git a/src/update_image.c b/src/update_image.c index c15a31b0..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,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 { @@ -689,7 +690,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; @@ -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; @@ -796,14 +797,16 @@ execute_add_command(struct update_command_journal *j, wim_target_path = add_cmd->add.wim_target_path; config_file = add_cmd->add.config_file; - DEBUG("fs_source_path=\"%"TS"\", wim_target_path=\"%"TS"\", add_flags=%#x", - fs_source_path, wim_target_path, add_flags); - memset(¶ms, 0, sizeof(params)); #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, @@ -829,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, ¶ms); + ret = (*scan_tree)(&branch, fs_source_path, ¶ms); if (ret) goto out_destroy_config; @@ -864,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, ¶ms); + ret = platform_default_scan_tree(&branch, config_file, ¶ms); if (ret) goto out_destroy_config; @@ -873,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); @@ -892,8 +901,6 @@ execute_delete_command(struct update_command_journal *j, flags = delete_cmd->delete_.delete_flags; wim_path = delete_cmd->delete_.wim_path; - DEBUG("Deleting WIM path \"%"TS"\" (flags=%#x)", wim_path, flags); - tree = get_dentry(wim, wim_path, WIMLIB_CASE_PLATFORM_DEFAULT); if (!tree) { /* Path to delete does not exist in the WIM. */ @@ -1064,22 +1071,6 @@ execute_rename_command(struct update_command_journal *j, return ret; } -static inline const tchar * -update_op_to_str(int op) -{ - switch (op) { - case WIMLIB_UPDATE_OP_ADD: - return T("add"); - case WIMLIB_UPDATE_OP_DELETE: - return T("delete"); - case WIMLIB_UPDATE_OP_RENAME: - return T("rename"); - default: - wimlib_assert(0); - return NULL; - } -} - static bool have_command_type(const struct wimlib_update_command *cmds, size_t num_cmds, enum wimlib_update_op op) @@ -1110,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; @@ -1138,8 +1129,6 @@ execute_update_commands(WIMStruct *wim, info.update.total_commands = num_cmds; ret = 0; for (size_t i = 0; i < num_cmds; i++) { - DEBUG("Executing update command %zu of %zu (op=%"TS")", - i + 1, num_cmds, update_op_to_str(cmds[i].op)); info.update.command = &cmds[i]; if (update_flags & WIMLIB_UPDATE_FLAG_SEND_PROGRESS) { ret = call_progress(wim->progfunc, @@ -1221,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; @@ -1244,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 */ @@ -1419,19 +1422,23 @@ 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) return WIMLIB_ERR_INVALID_PARAM; - DEBUG("Updating image %d with %zu commands", image, num_cmds); - /* 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]; - DEBUG("Preparing %zu update commands", num_cmds); + /* 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 @@ -1439,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. */ @@ -1448,17 +1455,11 @@ wimlib_update_image(WIMStruct *wim, goto out_free_cmds_copy; /* Actually execute the update commands. */ - DEBUG("Executing %zu update commands", num_cmds); ret = execute_update_commands(wim, cmds_copy, num_cmds, update_flags); 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 && @@ -1466,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; }