X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fupdate_image.c;h=ef5328059be12fc45fc0ff750c484d8ddf8b75a3;hp=ceb76010bbdc6e4c2649e3dfaa10200d31b13da2;hb=b5b9681794d1f5f13350e3567f6f6e74f5c779cf;hpb=dfd4355cb99cfcbdfd8b120c52c32df674e787f9 diff --git a/src/update_image.c b/src/update_image.c index ceb76010..ef532805 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -35,6 +35,7 @@ # include "wimlib/ntfs_3g.h" /* for do_ntfs_umount() */ #endif #include "wimlib/paths.h" +#include "wimlib/progress.h" #include "wimlib/xml.h" #include @@ -386,12 +387,14 @@ journaled_change_name(struct update_command_journal *j, struct wim_dentry *dentry, const tchar *new_name_tstr) { int ret; - utf16lechar *new_name = NULL; - u16 new_name_nbytes = 0; + utf16lechar *new_name; + size_t new_name_nbytes; struct update_primitive prim; /* Set the long name. */ - ret = get_utf16le_string(new_name_tstr, &new_name, &new_name_nbytes); + ret = tstr_to_utf16le(new_name_tstr, + tstrlen(new_name_tstr) * sizeof(tchar), + &new_name, &new_name_nbytes); if (ret) return ret; @@ -399,8 +402,10 @@ journaled_change_name(struct update_command_journal *j, prim.name.subject = dentry; prim.name.old_name = dentry->file_name; ret = record_update_primitive(j, prim); - if (ret) + if (ret) { + FREE(new_name); return ret; + } dentry->file_name = new_name; dentry->file_name_nbytes = new_name_nbytes; @@ -453,40 +458,11 @@ rollback_update(struct update_command_journal *j) free_update_command_journal(j); } -/* - * Set the name of @branch for placing it at @target in the WIM image. This - * assumes that @target is in "canonical form", as produced by - * canonicalize_wim_path(). - * - * Note: for the root target this produces the empty name. - */ -static int -set_branch_name(struct wim_dentry *branch, const utf16lechar *target) -{ - const utf16lechar *p; - - /* Find end of string. (We can assume it contains at least one - * character, the leading slash.) */ - wimlib_assert(target[0] == cpu_to_le16(WIM_PATH_SEPARATOR)); - p = target; - do { - p++; - } while (*p); - - while (*(p - 1) != cpu_to_le16(WIM_PATH_SEPARATOR)) - p--; - - - /* We're assuming no trailing slashes. */ - wimlib_assert(*p || p == &target[1]); - - return dentry_set_name_utf16le(branch, p); -} - static int handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, struct update_command_journal *j, - int add_flags, wimlib_progress_func_t progress_func) + int add_flags, + wimlib_progress_func_t progfunc, void *progctx) { bool branch_is_dir = dentry_is_directory(branch); bool existing_is_dir = dentry_is_directory(existing); @@ -523,7 +499,8 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, unlink_dentry(new_child); if (existing_child) { ret = handle_conflict(new_child, existing_child, - j, add_flags, progress_func); + j, add_flags, + progfunc, progctx); } else { ret = journaled_link(j, new_child, existing); } @@ -543,6 +520,7 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, /* Replace nondirectory file */ struct wim_dentry *parent; int ret; + union wimlib_progress_info info; parent = existing->parent; @@ -558,26 +536,25 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, if (ret) return ret; - if (progress_func && (add_flags & WIMLIB_ADD_FLAG_VERBOSE)) { - union wimlib_progress_info info; - info.replace.path_in_wim = existing->_full_path; - progress_func(WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM, &info); - } - return 0; + info.replace.path_in_wim = existing->_full_path; + return call_progress(progfunc, + WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM, + &info, progctx); } } static int -do_attach_branch(struct wim_dentry *branch, utf16lechar *target, +do_attach_branch(struct wim_dentry *branch, const utf16lechar *target, struct update_command_journal *j, - int add_flags, wimlib_progress_func_t progress_func) + int add_flags, wimlib_progress_func_t progfunc, void *progctx) { struct wim_dentry *parent; struct wim_dentry *existing; - utf16lechar empty_name[1] = {0}; - utf16lechar *cur_component_name; - utf16lechar *next_component_name; + const utf16lechar empty_name[1] = {0}; + const utf16lechar *cur_component_name; + size_t cur_component_nbytes; + const utf16lechar *next_component_name; int ret; /* Attempt to create root directory before proceeding to the "real" @@ -585,6 +562,7 @@ do_attach_branch(struct wim_dentry *branch, utf16lechar *target, parent = NULL; existing = *j->root_p; cur_component_name = empty_name; + cur_component_nbytes = 0; /* Skip leading slashes */ next_component_name = target; @@ -592,7 +570,7 @@ do_attach_branch(struct wim_dentry *branch, utf16lechar *target, next_component_name++; while (*next_component_name) { /* While not the last component ... */ - utf16lechar *end; + const utf16lechar *end; if (existing) { /* Descend into existing directory */ @@ -611,7 +589,8 @@ do_attach_branch(struct wim_dentry *branch, utf16lechar *target, if (ret) return ret; ret = dentry_set_name_utf16le(filler, - cur_component_name); + cur_component_name, + cur_component_nbytes); if (ret) { free_dentry(filler); return ret; @@ -634,7 +613,6 @@ do_attach_branch(struct wim_dentry *branch, utf16lechar *target, next_component_name = end; if (*end) { /* There will still be more components after this. */ - *end = 0; do { } while (*++next_component_name == cpu_to_le16(WIM_PATH_SEPARATOR)); wimlib_assert(*next_component_name); /* No trailing slashes */ @@ -643,17 +621,18 @@ do_attach_branch(struct wim_dentry *branch, utf16lechar *target, next_component_name = end; } parent = existing; + cur_component_nbytes = (end - cur_component_name) * sizeof(utf16lechar); existing = get_dentry_child_with_utf16le_name( parent, cur_component_name, - (end - cur_component_name) * sizeof(utf16lechar), + cur_component_nbytes, WIMLIB_CASE_PLATFORM_DEFAULT); } /* Last component */ if (existing) { - return handle_conflict(branch, existing, j, - add_flags, progress_func); + return handle_conflict(branch, existing, j, add_flags, + progfunc, progctx); } else { return journaled_link(j, branch, parent); } @@ -674,46 +653,35 @@ do_attach_branch(struct wim_dentry *branch, utf16lechar *target, */ static int attach_branch(struct wim_dentry *branch, const tchar *target_tstr, - struct update_command_journal *j, - int add_flags, wimlib_progress_func_t progress_func) + struct update_command_journal *j, int add_flags, + wimlib_progress_func_t progfunc, void *progctx) { int ret; - utf16lechar *target; + const utf16lechar *target; + ret = 0; if (unlikely(!branch)) - return 0; + goto out; -#if TCHAR_IS_UTF16LE - target = memdup(target_tstr, - (tstrlen(target_tstr) + 1) * sizeof(target_tstr[0])); - if (!target) { - ret = WIMLIB_ERR_NOMEM; + ret = tstr_get_utf16le(target_tstr, &target); + if (ret) goto out_free_branch; - } -#else - { - size_t target_nbytes; - ret = tstr_to_utf16le(target_tstr, - tstrlen(target_tstr) * sizeof(target_tstr[0]), - &target, &target_nbytes); - if (ret) - goto out_free_branch; - } -#endif - ret = set_branch_name(branch, target); + BUILD_BUG_ON(WIM_PATH_SEPARATOR != OS_PREFERRED_PATH_SEPARATOR); + ret = dentry_set_name(branch, path_basename(target_tstr)); if (ret) goto out_free_target; - ret = do_attach_branch(branch, target, j, add_flags, progress_func); + ret = do_attach_branch(branch, target, j, add_flags, progfunc, progctx); if (ret) goto out_free_target; /* branch was successfully committed to the journal */ branch = NULL; out_free_target: - FREE(target); + tstr_put_utf16le(target); out_free_branch: free_dentry_tree(branch, j->lookup_table); +out: return ret; } @@ -789,8 +757,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, - wimlib_progress_func_t progress_func) + struct list_head *unhashed_streams) { int ret; int add_flags; @@ -841,11 +808,14 @@ execute_add_command(struct update_command_journal *j, params.add_flags = add_flags; params.extra_arg = extra_arg; - params.progress_func = progress_func; + params.progfunc = wim->progfunc; + params.progctx = wim->progctx; params.progress.scan.source = fs_source_path; params.progress.scan.wim_target_path = wim_target_path; - if (progress_func) - progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, ¶ms.progress); + ret = call_progress(params.progfunc, WIMLIB_PROGRESS_MSG_SCAN_BEGIN, + ¶ms.progress, params.progctx); + if (ret) + goto out_destroy_config; if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path)) params.add_flags |= WIMLIB_ADD_FLAG_ROOT; @@ -853,8 +823,12 @@ execute_add_command(struct update_command_journal *j, if (ret) goto out_destroy_config; - if (progress_func) - progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, ¶ms.progress); + 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; + } if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path) && branch && !dentry_is_directory(branch)) @@ -866,7 +840,7 @@ execute_add_command(struct update_command_journal *j, } ret = attach_branch(branch, wim_target_path, j, - add_flags, params.progress_func); + add_flags, params.progfunc, params.progctx); if (ret) goto out_cleanup_after_capture; @@ -874,7 +848,7 @@ execute_add_command(struct update_command_journal *j, WIMLIB_IS_WIM_ROOT_PATH(wim_target_path)) { params.add_flags = 0; - params.progress_func = NULL; + params.progfunc = NULL; params.config = NULL; /* If a capture configuration file was explicitly specified when @@ -884,7 +858,7 @@ execute_add_command(struct update_command_journal *j, if (ret) goto out_cleanup_after_capture; - ret = attach_branch(branch, wimboot_cfgfile, j, 0, NULL); + ret = attach_branch(branch, wimboot_cfgfile, j, 0, NULL, NULL); if (ret) goto out_cleanup_after_capture; } @@ -953,7 +927,7 @@ free_dentry_full_path(struct wim_dentry *dentry, void *_ignore) /* Is @d1 a (possibly nonproper) ancestor of @d2? */ static bool -is_ancestor(struct wim_dentry *d1, struct wim_dentry *d2) +is_ancestor(const struct wim_dentry *d1, const struct wim_dentry *d2) { for (;;) { if (d2 == d1) @@ -1121,8 +1095,7 @@ static int execute_update_commands(WIMStruct *wim, const struct wimlib_update_command *cmds, size_t num_cmds, - int update_flags, - wimlib_progress_func_t progress_func) + int update_flags) { struct wim_inode_table *inode_table; struct wim_sd_set *sd_set; @@ -1142,7 +1115,7 @@ execute_update_commands(WIMStruct *wim, if (ret) goto out; - ret = init_sd_set(sd_set, wim_security_data(wim)); + ret = init_sd_set(sd_set, wim_get_current_security_data(wim)); if (ret) goto out_destroy_inode_table; @@ -1168,19 +1141,20 @@ execute_update_commands(WIMStruct *wim, 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)); - if (update_flags & WIMLIB_UPDATE_FLAG_SEND_PROGRESS && - progress_func) - { - info.update.command = &cmds[i]; - (*progress_func)(WIMLIB_PROGRESS_MSG_UPDATE_BEGIN_COMMAND, - &info); + info.update.command = &cmds[i]; + if (update_flags & WIMLIB_UPDATE_FLAG_SEND_PROGRESS) { + ret = call_progress(wim->progfunc, + WIMLIB_PROGRESS_MSG_UPDATE_BEGIN_COMMAND, + &info, wim->progctx); + if (ret) + goto rollback; } + ret = WIMLIB_ERR_INVALID_PARAM; switch (cmds[i].op) { case WIMLIB_UPDATE_OP_ADD: ret = execute_add_command(j, wim, &cmds[i], inode_table, - sd_set, &unhashed_streams, - progress_func); + sd_set, &unhashed_streams); break; case WIMLIB_UPDATE_OP_DELETE: ret = execute_delete_command(j, wim, &cmds[i]); @@ -1192,11 +1166,12 @@ execute_update_commands(WIMStruct *wim, if (unlikely(ret)) goto rollback; info.update.completed_commands++; - if (update_flags & WIMLIB_UPDATE_FLAG_SEND_PROGRESS && - progress_func) - { - (*progress_func)(WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND, - &info); + if (update_flags & WIMLIB_UPDATE_FLAG_SEND_PROGRESS) { + ret = call_progress(wim->progfunc, + WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND, + &info, wim->progctx); + if (ret) + goto rollback; } next_command(j); } @@ -1302,7 +1277,7 @@ check_add_command(struct wimlib_update_command *cmd, if (!is_entire_image) { if (add_flags & WIMLIB_ADD_FLAG_NTFS) { - ERROR("Cannot add directly from a NTFS volume " + ERROR("Cannot add directly from an NTFS volume " "when not capturing a full image!"); return WIMLIB_ERR_INVALID_PARAM; } @@ -1449,8 +1424,7 @@ wimlib_update_image(WIMStruct *wim, int image, const struct wimlib_update_command *cmds, size_t num_cmds, - int update_flags, - wimlib_progress_func_t progress_func) + int update_flags) { int ret; struct wimlib_update_command *cmds_copy; @@ -1491,8 +1465,7 @@ wimlib_update_image(WIMStruct *wim, /* Actually execute the update commands. */ DEBUG("Executing %zu update commands", num_cmds); - ret = execute_update_commands(wim, cmds_copy, num_cmds, update_flags, - progress_func); + ret = execute_update_commands(wim, cmds_copy, num_cmds, update_flags); if (ret) goto out_free_cmds_copy; @@ -1507,3 +1480,52 @@ out_free_cmds_copy: out: return ret; } + +static int +update1(WIMStruct *wim, int image, const struct wimlib_update_command *cmd) +{ + return wimlib_update_image(wim, image, cmd, 1, 0); +} + +WIMLIBAPI int +wimlib_delete_path(WIMStruct *wim, int image, + const tchar *path, int delete_flags) +{ + struct wimlib_update_command cmd; + + cmd.op = WIMLIB_UPDATE_OP_DELETE; + cmd.delete_.wim_path = (tchar *)path; + cmd.delete_.delete_flags = delete_flags; + + return update1(wim, image, &cmd); +} + +WIMLIBAPI int +wimlib_rename_path(WIMStruct *wim, int image, + const tchar *source_path, const tchar *dest_path) +{ + struct wimlib_update_command cmd; + + cmd.op = WIMLIB_UPDATE_OP_RENAME; + cmd.rename.wim_source_path = (tchar *)source_path; + cmd.rename.wim_target_path = (tchar *)dest_path; + cmd.rename.rename_flags = 0; + + return update1(wim, image, &cmd); +} + +WIMLIBAPI int +wimlib_add_tree(WIMStruct *wim, int image, + const tchar *fs_source_path, const tchar *wim_target_path, + int add_flags) +{ + struct wimlib_update_command cmd; + + cmd.op = WIMLIB_UPDATE_OP_ADD; + cmd.add.fs_source_path = (tchar *)fs_source_path; + cmd.add.wim_target_path = (tchar *)wim_target_path; + cmd.add.add_flags = add_flags; + cmd.add.config_file = NULL; + + return update1(wim, image, &cmd); +}