X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fupdate_image.c;h=bd8702e2ef397041b13a139580d45ff59063f231;hb=0ddd8e57f633908c771b606cc606f434c15ac832;hp=10093a0cec7241db63c37862edc2b57108deaf1d;hpb=0ab938cc9554f3d5c6835c14b9177823e0e9b7bb;p=wimlib diff --git a/src/update_image.c b/src/update_image.c index 10093a0c..bd8702e2 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -88,17 +88,17 @@ do_overlay(struct wim_dentry *target, struct wim_dentry *branch) /* Attach or overlay a branch onto the WIM image. * * @root_p: - * Pointer to the root of the WIM image, or pointer to NULL if it has not - * been created yet. + * Pointer to the root of the WIM image, or pointer to NULL if it has not + * been created yet. * @branch - * Branch to add. + * Branch to add. * @target_path: - * Path in the WIM image to add the branch, with leading and trailing - * slashes stripped. + * Path in the WIM image to add the branch, with leading and trailing + * slashes stripped. */ static int attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, - tchar *target_path) + tchar *target_path, CASE_SENSITIVITY_TYPE case_type) { tchar *slash; struct wim_dentry *dentry, *parent, *target; @@ -136,7 +136,8 @@ attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, parent = *root_p; while ((slash = tstrchr(target_path, WIM_PATH_SEPARATOR))) { *slash = T('\0'); - dentry = get_dentry_child_with_name(parent, target_path); + dentry = get_dentry_child_with_name(parent, target_path, + case_type); if (!dentry) { ret = new_filler_directory(target_path, &dentry); if (ret) @@ -156,7 +157,8 @@ attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, /* If the target path already existed, overlay the branch onto it. * Otherwise, set the branch as the target path. */ target = get_dentry_child_with_utf16le_name(parent, branch->file_name, - branch->file_name_nbytes); + branch->file_name_nbytes, + case_type); if (target) { return do_overlay(target, branch); } else { @@ -252,11 +254,9 @@ execute_add_command(WIMStruct *wim, if (wim_target_path[0] == T('\0')) params.add_flags |= WIMLIB_ADD_FLAG_ROOT; ret = (*capture_tree)(&branch, fs_source_path, ¶ms); - if (ret) { - ERROR("Failed to build dentry tree for \"%"TS"\"", - fs_source_path); + if (ret) goto out_destroy_sd_set; - } + if (branch) { /* Use the target name, not the source name, for * the root of each branch from a capture @@ -267,7 +267,8 @@ execute_add_command(WIMStruct *wim, if (ret) goto out_ntfs_umount; - ret = attach_branch(&imd->root_dentry, branch, wim_target_path); + ret = attach_branch(&imd->root_dentry, branch, wim_target_path, + WIMLIB_CASE_PLATFORM_DEFAULT); if (ret) goto out_ntfs_umount; } @@ -307,12 +308,12 @@ execute_delete_command(WIMStruct *wim, bool is_root; wimlib_assert(delete_cmd->op == WIMLIB_UPDATE_OP_DELETE); - flags = delete_cmd->delete.delete_flags; - wim_path = delete_cmd->delete.wim_path; + 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); + tree = get_dentry(wim, wim_path, WIMLIB_CASE_PLATFORM_DEFAULT); if (!tree) { /* Path to delete does not exist in the WIM. */ if (flags & WIMLIB_DELETE_FLAG_FORCE) { @@ -339,80 +340,6 @@ execute_delete_command(WIMStruct *wim, return 0; } -static int -free_dentry_full_path(struct wim_dentry *dentry, void *_ignore) -{ - FREE(dentry->_full_path); - dentry->_full_path = NULL; - return 0; -} - -/* - * Rename a file or directory in the WIM. - * - * This is also called from wimfs_rename() in the FUSE mount code. - */ -int -rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to) -{ - struct wim_dentry *src; - struct wim_dentry *dst; - struct wim_dentry *parent_of_dst; - int ret; - - /* This rename() implementation currently only supports actual files - * (not alternate data streams) */ - - src = get_dentry(wim, from); - if (!src) - return -errno; - - dst = get_dentry(wim, to); - - if (dst) { - /* Destination file exists */ - - if (src == dst) /* Same file */ - return 0; - - if (!dentry_is_directory(src)) { - /* Cannot rename non-directory to directory. */ - if (dentry_is_directory(dst)) - return -EISDIR; - } else { - /* Cannot rename directory to a non-directory or a non-empty - * directory */ - if (!dentry_is_directory(dst)) - return -ENOTDIR; - if (inode_has_children(dst->d_inode)) - return -ENOTEMPTY; - } - parent_of_dst = dst->parent; - } else { - /* Destination does not exist */ - parent_of_dst = get_parent_dentry(wim, to); - if (!parent_of_dst) - return -errno; - - if (!dentry_is_directory(parent_of_dst)) - return -ENOTDIR; - } - - ret = set_dentry_name(src, path_basename(to)); - if (ret) - return -ENOMEM; - if (dst) { - unlink_dentry(dst); - free_dentry_tree(dst, wim->lookup_table); - } - unlink_dentry(src); - dentry_add_child(parent_of_dst, src); - if (src->_full_path) - for_dentry_in_tree(src, free_dentry_full_path, NULL); - return 0; -} - - static int execute_rename_command(WIMStruct *wim, const struct wimlib_update_command *rename_cmd) @@ -422,7 +349,8 @@ execute_rename_command(WIMStruct *wim, wimlib_assert(rename_cmd->op == WIMLIB_UPDATE_OP_RENAME); ret = rename_wim_path(wim, rename_cmd->rename.wim_source_path, - rename_cmd->rename.wim_target_path); + rename_cmd->rename.wim_target_path, + WIMLIB_CASE_PLATFORM_DEFAULT); if (ret) { ret = -ret; errno = ret; @@ -514,6 +442,23 @@ execute_update_commands(WIMStruct *wim, return ret; } + +tchar *winpats[] = { + T("/$ntfs.log"), + T("/hiberfil.sys"), + T("/pagefile.sys"), + T("/System Volume Information"), + T("/RECYCLER"), + T("/Windows/CSC"), +}; + +static const struct wimlib_capture_config winconfig = { + .exclusion_pats = { + .num_pats = ARRAY_LEN(winpats), + .pats = winpats, + }, +}; + static int check_add_command(struct wimlib_update_command *cmd, const struct wim_header *hdr) @@ -629,7 +574,7 @@ free_update_commands(struct wimlib_update_command *cmds, size_t num_cmds) free_capture_config(cmds[i].add.config); break; case WIMLIB_UPDATE_OP_DELETE: - FREE(cmds[i].delete.wim_path); + FREE(cmds[i].delete_.wim_path); break; case WIMLIB_UPDATE_OP_RENAME: FREE(cmds[i].rename.wim_source_path); @@ -648,6 +593,7 @@ copy_update_commands(const struct wimlib_update_command *cmds, { int ret; struct wimlib_update_command *cmds_copy; + const struct wimlib_capture_config *config; cmds_copy = CALLOC(num_cmds, sizeof(cmds[0])); if (!cmds_copy) @@ -664,8 +610,11 @@ copy_update_commands(const struct wimlib_update_command *cmds, if (!cmds_copy[i].add.fs_source_path || !cmds_copy[i].add.wim_target_path) goto oom; - if (cmds[i].add.config) { - ret = copy_and_canonicalize_capture_config(cmds[i].add.config, + config = cmds[i].add.config; + if (cmds[i].add.add_flags & WIMLIB_ADD_FLAG_WINCONFIG) + config = &winconfig; + if (config) { + ret = copy_and_canonicalize_capture_config(config, &cmds_copy[i].add.config); if (ret) goto err; @@ -673,11 +622,11 @@ copy_update_commands(const struct wimlib_update_command *cmds, cmds_copy[i].add.add_flags = cmds[i].add.add_flags; break; case WIMLIB_UPDATE_OP_DELETE: - cmds_copy[i].delete.wim_path = - canonicalize_wim_path(cmds[i].delete.wim_path); - if (!cmds_copy[i].delete.wim_path) + cmds_copy[i].delete_.wim_path = + canonicalize_wim_path(cmds[i].delete_.wim_path); + if (!cmds_copy[i].delete_.wim_path) goto oom; - cmds_copy[i].delete.delete_flags = cmds[i].delete.delete_flags; + cmds_copy[i].delete_.delete_flags = cmds[i].delete_.delete_flags; break; case WIMLIB_UPDATE_OP_RENAME: cmds_copy[i].rename.wim_source_path =