X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fupdate_image.c;h=15d7f7491fab3e82b5314067af9b5ee0886dca84;hp=65389e156cc227464c82d6df0cc0b7ad3e08cab7;hb=a06ae552a9774672ceca5850cd861a67223137a0;hpb=7251c7d0afac3b738dda1c4f45e6d3d3090f2622 diff --git a/src/update_image.c b/src/update_image.c index 65389e15..15d7f749 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -49,29 +49,23 @@ # include "config.h" #endif +#include +#include +#include + +#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" #include "wimlib/error.h" -#include "wimlib/lookup_table.h" #include "wimlib/metadata.h" -#ifdef WITH_NTFS_3G -# include "wimlib/ntfs_3g.h" /* for do_ntfs_umount() */ -#endif #include "wimlib/paths.h" #include "wimlib/progress.h" #include "wimlib/xml.h" -#include -#include -#include - -#ifdef HAVE_ALLOCA_H -# include -#endif - /* Saved specification of a "primitive" update operation that was performed. */ struct update_primitive { enum { @@ -137,8 +131,8 @@ struct update_command_journal { /* Location of the WIM image's root pointer. */ struct wim_dentry **root_p; - /* Pointer to the lookup table of the WIM (may needed for rollback) */ - struct wim_lookup_table *lookup_table; + /* Pointer to the blob table of the WIM (may needed for rollback) */ + struct blob_table *blob_table; /* List of dentries that are currently unlinked from the WIM image. * These must be freed when no longer needed for commit or rollback. */ @@ -160,7 +154,7 @@ init_update_primitive_list(struct update_primitive_list *l) * commands. */ static struct update_command_journal * new_update_command_journal(size_t num_cmds, struct wim_dentry **root_p, - struct wim_lookup_table *lookup_table) + struct blob_table *blob_table) { struct update_command_journal *j; @@ -169,7 +163,7 @@ new_update_command_journal(size_t num_cmds, struct wim_dentry **root_p, j->num_cmds = num_cmds; j->cur_cmd = 0; j->root_p = root_p; - j->lookup_table = lookup_table; + j->blob_table = blob_table; INIT_LIST_HEAD(&j->orphans); for (size_t i = 0; i < num_cmds; i++) init_update_primitive_list(&j->cmd_prims[i]); @@ -189,7 +183,7 @@ free_update_command_journal(struct update_command_journal *j) orphan = list_first_entry(&j->orphans, struct wim_dentry, tmp_list); list_del(&orphan->tmp_list); - free_dentry_tree(orphan, j->lookup_table); + free_dentry_tree(orphan, j->blob_table); } for (size_t i = 0; i < j->num_cmds; i++) @@ -298,7 +292,7 @@ rollback_name_change(utf16lechar *old_name, FREE(*name_ptr); if (old_name) { *name_ptr = old_name; - *name_nbytes_ptr = utf16le_strlen(old_name); + *name_nbytes_ptr = utf16le_len_bytes(old_name); } else { *name_ptr = NULL; *name_nbytes_ptr = 0; @@ -535,7 +529,7 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, return ret; } } - free_dentry(branch); + free_dentry_tree(branch, j->blob_table); return 0; } else if (add_flags & WIMLIB_ADD_FLAG_NO_REPLACE) { /* Can't replace nondirectory file */ @@ -708,7 +702,7 @@ attach_branch(struct wim_dentry *branch, const tchar *target_tstr, out_free_target: tstr_put_utf16le(target); out_free_branch: - free_dentry_tree(branch, j->lookup_table); + free_dentry_tree(branch, j->blob_table); out: return ret; } @@ -785,7 +779,7 @@ execute_add_command(struct update_command_journal *j, const struct wimlib_update_command *add_cmd, struct wim_inode_table *inode_table, struct wim_sd_set *sd_set, - struct list_head *unhashed_streams) + struct list_head *unhashed_blobs) { int ret; int add_flags; @@ -795,10 +789,6 @@ execute_add_command(struct update_command_journal *j, struct capture_params params; struct capture_config config; capture_tree_t capture_tree = platform_default_capture_tree; -#ifdef WITH_NTFS_3G - struct _ntfs_volume *ntfs_vol = NULL; -#endif - void *extra_arg = NULL; struct wim_dentry *branch; add_flags = add_cmd->add.add_flags; @@ -812,15 +802,8 @@ execute_add_command(struct update_command_journal *j, memset(¶ms, 0, sizeof(params)); #ifdef WITH_NTFS_3G - if (add_flags & WIMLIB_ADD_FLAG_NTFS) { - capture_tree = build_dentry_tree_ntfs; - extra_arg = &ntfs_vol; - if (wim_get_current_image_metadata(wim)->ntfs_vol != NULL) { - ERROR("NTFS volume already set"); - ret = WIMLIB_ERR_INVALID_PARAM; - goto out; - } - } + if (add_flags & WIMLIB_ADD_FLAG_NTFS) + capture_tree = ntfs_3g_build_dentry_tree; #endif ret = get_capture_config(config_file, &config, @@ -828,13 +811,12 @@ execute_add_command(struct update_command_journal *j, if (ret) goto out; - params.lookup_table = wim->lookup_table; - params.unhashed_streams = unhashed_streams; + params.blob_table = wim->blob_table; + params.unhashed_blobs = unhashed_blobs; params.inode_table = inode_table; params.sd_set = sd_set; params.config = &config; params.add_flags = add_flags; - params.extra_arg = extra_arg; params.progfunc = wim->progfunc; params.progctx = wim->progctx; @@ -854,8 +836,8 @@ execute_add_command(struct update_command_journal *j, ret = call_progress(params.progfunc, WIMLIB_PROGRESS_MSG_SCAN_END, ¶ms.progress, params.progctx); if (ret) { - free_dentry_tree(branch, wim->lookup_table); - goto out_cleanup_after_capture; + free_dentry_tree(branch, wim->blob_table); + goto out_destroy_config; } if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path) && @@ -863,14 +845,14 @@ execute_add_command(struct update_command_journal *j, { ERROR("\"%"TS"\" is not a directory!", fs_source_path); ret = WIMLIB_ERR_NOTDIR; - free_dentry_tree(branch, wim->lookup_table); - goto out_cleanup_after_capture; + free_dentry_tree(branch, wim->blob_table); + goto out_destroy_config; } ret = attach_branch(branch, wim_target_path, j, add_flags, params.progfunc, params.progctx); if (ret) - goto out_cleanup_after_capture; + goto out_destroy_config; if (config_file && (add_flags & WIMLIB_ADD_FLAG_WIMBOOT) && WIMLIB_IS_WIM_ROOT_PATH(wim_target_path)) @@ -884,23 +866,14 @@ execute_add_command(struct update_command_journal *j, * /Windows/System32/WimBootCompress.ini in the WIM image. */ ret = platform_default_capture_tree(&branch, config_file, ¶ms); if (ret) - goto out_cleanup_after_capture; + goto out_destroy_config; ret = attach_branch(branch, wimboot_cfgfile, j, 0, NULL, NULL); if (ret) - goto out_cleanup_after_capture; + goto out_destroy_config; } -#ifdef WITH_NTFS_3G - wim_get_current_image_metadata(wim)->ntfs_vol = ntfs_vol; -#endif ret = 0; - goto out_destroy_config; -out_cleanup_after_capture: -#ifdef WITH_NTFS_3G - if (ntfs_vol) - do_ntfs_umount(ntfs_vol); -#endif out_destroy_config: destroy_capture_config(&config); out: @@ -1039,7 +1012,7 @@ rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to, return -ENOMEM; if (dst) { unlink_dentry(dst); - free_dentry_tree(dst, wim->lookup_table); + free_dentry_tree(dst, wim->blob_table); } unlink_dentry(src); dentry_add_child(parent_of_dst, src); @@ -1125,7 +1098,7 @@ execute_update_commands(WIMStruct *wim, { struct wim_inode_table *inode_table; struct wim_sd_set *sd_set; - struct list_head unhashed_streams; + struct list_head unhashed_blobs; struct update_command_journal *j; union wimlib_progress_info info; int ret; @@ -1145,7 +1118,7 @@ execute_update_commands(WIMStruct *wim, if (ret) goto out_destroy_inode_table; - INIT_LIST_HEAD(&unhashed_streams); + INIT_LIST_HEAD(&unhashed_blobs); } else { inode_table = NULL; sd_set = NULL; @@ -1155,7 +1128,7 @@ execute_update_commands(WIMStruct *wim, */ j = new_update_command_journal(num_cmds, &wim_get_current_image_metadata(wim)->root_dentry, - wim->lookup_table); + wim->blob_table); if (!j) { ret = WIMLIB_ERR_NOMEM; goto out_destroy_sd_set; @@ -1179,7 +1152,7 @@ execute_update_commands(WIMStruct *wim, switch (cmds[i].op) { case WIMLIB_UPDATE_OP_ADD: ret = execute_add_command(j, wim, &cmds[i], inode_table, - sd_set, &unhashed_streams); + sd_set, &unhashed_blobs); break; case WIMLIB_UPDATE_OP_DELETE: ret = execute_delete_command(j, wim, &cmds[i]); @@ -1207,7 +1180,7 @@ execute_update_commands(WIMStruct *wim, imd = wim_get_current_image_metadata(wim); - list_splice_tail(&unhashed_streams, &imd->unhashed_streams); + list_splice_tail(&unhashed_blobs, &imd->unhashed_blobs); inode_table_prepare_inode_list(inode_table, &imd->inode_list); } goto out_destroy_sd_set; @@ -1255,9 +1228,8 @@ check_add_command(struct wimlib_update_command *cmd, #ifndef WITH_NTFS_3G if (add_flags & WIMLIB_ADD_FLAG_NTFS) { - ERROR("wimlib was compiled without support for NTFS-3g, so\n" - " we cannot capture a WIM image directly " - "from an NTFS volume"); + ERROR("NTFS-3g capture mode is unsupported because wimlib " + "was compiled --without-ntfs-3g"); return WIMLIB_ERR_UNSUPPORTED; } #endif @@ -1302,12 +1274,6 @@ check_add_command(struct wimlib_update_command *cmd, } if (!is_entire_image) { - if (add_flags & WIMLIB_ADD_FLAG_NTFS) { - ERROR("Cannot add directly from an NTFS volume " - "when not capturing a full image!"); - return WIMLIB_ERR_INVALID_PARAM; - } - if (add_flags & WIMLIB_ADD_FLAG_RPFIX) { ERROR("Cannot do reparse point fixups when " "not capturing a full image!");