X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fupdate_image.c;h=5a5ae69066f590f119fed933296a410c545be2bc;hp=eb848e361b96fe2203712ce1e686b98b869806ac;hb=e10a0fd1f906c342b0b45bc393ec10043c6a8936;hpb=e176e9731e696562bab8de7b9bd34c019deef3e8 diff --git a/src/update_image.c b/src/update_image.c index eb848e36..5a5ae690 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -98,7 +98,7 @@ do_overlay(struct wim_dentry *target, struct wim_dentry *branch) */ 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 { @@ -233,8 +235,8 @@ execute_add_command(WIMStruct *wim, goto out_destroy_inode_table; INIT_LIST_HEAD(&unhashed_streams); - wim->lookup_table->unhashed_streams = &unhashed_streams; params.lookup_table = wim->lookup_table; + params.unhashed_streams = &unhashed_streams; params.config = config; params.add_flags = add_flags; params.extra_arg = extra_arg; @@ -260,12 +262,13 @@ execute_add_command(WIMStruct *wim, * the root of each branch from a capture * source. (This will also set the root dentry * of the entire image to be unnamed.) */ - ret = set_dentry_name(branch, + ret = dentry_set_name(branch, path_basename(wim_target_path)); 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; } @@ -310,7 +313,7 @@ execute_delete_command(WIMStruct *wim, 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) { @@ -337,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 (dentry_has_children(dst)) - 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) @@ -420,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; @@ -535,6 +465,21 @@ check_add_command(struct wimlib_update_command *cmd, { int add_flags = cmd->add.add_flags; + if (add_flags & ~(WIMLIB_ADD_FLAG_NTFS | + WIMLIB_ADD_FLAG_DEREFERENCE | + WIMLIB_ADD_FLAG_VERBOSE | + /* BOOT doesn't make sense for wimlib_update_image() */ + /*WIMLIB_ADD_FLAG_BOOT |*/ + WIMLIB_ADD_FLAG_UNIX_DATA | + WIMLIB_ADD_FLAG_NO_ACLS | + WIMLIB_ADD_FLAG_STRICT_ACLS | + WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE | + WIMLIB_ADD_FLAG_RPFIX | + WIMLIB_ADD_FLAG_NORPFIX | + WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE | + WIMLIB_ADD_FLAG_WINCONFIG)) + return WIMLIB_ERR_INVALID_PARAM; + /* Are we adding the entire image or not? An empty wim_target_path * indicates that the tree we're adding is to be placed in the root of * the image. We consider this to be capturing the entire image, @@ -604,6 +549,23 @@ check_add_command(struct wimlib_update_command *cmd, return 0; } +static int +check_delete_command(const struct wimlib_update_command *cmd) +{ + if (cmd->delete_.delete_flags & ~(WIMLIB_DELETE_FLAG_FORCE | + WIMLIB_DELETE_FLAG_RECURSIVE)) + return WIMLIB_ERR_INVALID_PARAM; + return 0; +} + +static int +check_rename_command(const struct wimlib_update_command *cmd) +{ + if (cmd->rename.rename_flags != 0) + return WIMLIB_ERR_INVALID_PARAM; + return 0; +} + static int check_update_command(struct wimlib_update_command *cmd, const struct wim_header *hdr) @@ -612,8 +574,9 @@ check_update_command(struct wimlib_update_command *cmd, case WIMLIB_UPDATE_OP_ADD: return check_add_command(cmd, hdr); case WIMLIB_UPDATE_OP_DELETE: + return check_delete_command(cmd); case WIMLIB_UPDATE_OP_RENAME: - break; + return check_rename_command(cmd); } return 0; } @@ -737,6 +700,9 @@ wimlib_update_image(WIMStruct *wim, struct wimlib_update_command *cmds_copy; bool deletion_requested = false; + if (update_flags & ~WIMLIB_UPDATE_FLAG_SEND_PROGRESS) + return WIMLIB_ERR_INVALID_PARAM; + DEBUG("Updating image %d with %zu commands", image, num_cmds); for (size_t i = 0; i < num_cmds; i++)