X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fupdate_image.c;h=af784f99588f36878469388ae5973386510d72bc;hb=036c7da59a54e9a24b1afb917b4f9f10eee176ee;hp=70038d42d0e605bbea400ef9a9406bf2779a88b2;hpb=269f10a27c62027d48c0ba58f164d20e3bf3cf85;p=wimlib diff --git a/src/update_image.c b/src/update_image.c index 70038d42..af784f99 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -328,15 +328,13 @@ static int journaled_link(struct update_command_journal *j, struct wim_dentry *subject, struct wim_dentry *parent) { - struct update_primitive prim = { - .type = LINK_DENTRY, - .link = { - .subject = subject, - .parent = parent, - }, - }; + struct update_primitive prim; int ret; + prim.type = LINK_DENTRY; + prim.link.subject = subject; + prim.link.parent = parent; + ret = record_update_primitive(j, prim); if (ret) return ret; @@ -356,21 +354,18 @@ journaled_link(struct update_command_journal *j, static int journaled_unlink(struct update_command_journal *j, struct wim_dentry *subject) { - int ret; struct wim_dentry *parent; + struct update_primitive prim; + int ret; if (dentry_is_root(subject)) parent = NULL; else parent = subject->parent; - struct update_primitive prim = { - .type = UNLINK_DENTRY, - .link = { - .subject = subject, - .parent = parent, - }, - }; + prim.type = UNLINK_DENTRY; + prim.link.subject = subject; + prim.link.parent = parent; ret = record_update_primitive(j, prim); if (ret) @@ -391,12 +386,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; @@ -404,8 +401,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; @@ -458,24 +457,6 @@ rollback_update(struct update_command_journal *j) free_update_command_journal(j); } -static int -set_branch_name(struct wim_dentry *branch, const utf16lechar *target) -{ - const utf16lechar *p; - - p = target; - while (*p) - p++; - - /* No trailing slashes allowed */ - wimlib_assert(p == target || *(p - 1) != cpu_to_le16(WIM_PATH_SEPARATOR)); - - while (p > target && *(p - 1) != cpu_to_le16(WIM_PATH_SEPARATOR)) - p--; - - return dentry_set_name_utf16le(branch, p); -} - static int handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, struct update_command_journal *j, @@ -562,15 +543,16 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, } 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) { 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" @@ -578,6 +560,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; @@ -585,7 +568,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 */ @@ -600,11 +583,12 @@ do_attach_branch(struct wim_dentry *branch, utf16lechar *target, * the way by creating a filler directory. */ struct wim_dentry *filler; - ret = new_filler_directory(T(""), &filler); + ret = new_filler_directory(&filler); 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; @@ -627,7 +611,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 */ @@ -636,10 +619,11 @@ 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); } @@ -671,30 +655,18 @@ attach_branch(struct wim_dentry *branch, const tchar *target_tstr, int add_flags, wimlib_progress_func_t progress_func) { 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; @@ -704,9 +676,10 @@ attach_branch(struct wim_dentry *branch, const tchar *target_tstr, /* 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; } @@ -715,6 +688,7 @@ static const char wincfg[] = "/$ntfs.log\n" "/hiberfil.sys\n" "/pagefile.sys\n" +"/swapfile.sys\n" "/System Volume Information\n" "/RECYCLER\n" "/Windows/CSC\n"; @@ -760,11 +734,11 @@ get_capture_config(const tchar *config_file, struct capture_config *config, /* Use Windows default. */ if (config_file) return WIMLIB_ERR_INVALID_PARAM; - ret = do_read_capture_config_file(T("wincfg"), wincfg, - sizeof(wincfg) - 1, config); + ret = read_capture_config(T("wincfg"), wincfg, + sizeof(wincfg) - 1, config); } else if (config_file) { /* Use the specified configuration file. */ - ret = do_read_capture_config_file(config_file, NULL, 0, config); + ret = read_capture_config(config_file, NULL, 0, config); } else { /* ... Or don't use any configuration file at all. No files * will be excluded from capture, all files will be compressed, @@ -808,8 +782,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) { - #ifdef WITH_NTFS_3G capture_tree = build_dentry_tree_ntfs; extra_arg = &ntfs_vol; if (wim_get_current_image_metadata(wim)->ntfs_vol != NULL) { @@ -817,11 +791,8 @@ execute_add_command(struct update_command_journal *j, ret = WIMLIB_ERR_INVALID_PARAM; goto out; } - #else - ret = WIMLIB_ERR_INVALID_PARAM; - goto out; - #endif } +#endif ret = get_capture_config(config_file, &config, add_flags, fs_source_path); @@ -842,10 +813,7 @@ execute_add_command(struct update_command_journal *j, if (progress_func) progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, ¶ms.progress); - config.prefix = fs_source_path; - config.prefix_num_tchars = tstrlen(fs_source_path); - - if (wim_target_path[0] == T('\0')) + if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path)) params.add_flags |= WIMLIB_ADD_FLAG_ROOT; ret = (*capture_tree)(&branch, fs_source_path, ¶ms); if (ret) @@ -854,7 +822,7 @@ execute_add_command(struct update_command_journal *j, if (progress_func) progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, ¶ms.progress); - if (wim_target_path[0] == T('\0') && + if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path) && branch && !dentry_is_directory(branch)) { ERROR("\"%"TS"\" is not a directory!", fs_source_path); @@ -869,7 +837,7 @@ execute_add_command(struct update_command_journal *j, goto out_cleanup_after_capture; if (config_file && (add_flags & WIMLIB_ADD_FLAG_WIMBOOT) && - wim_target_path[0] == T('\0')) + WIMLIB_IS_WIM_ROOT_PATH(wim_target_path)) { params.add_flags = 0; params.progress_func = NULL; @@ -949,6 +917,19 @@ free_dentry_full_path(struct wim_dentry *dentry, void *_ignore) return 0; } +/* Is @d1 a (possibly nonproper) ancestor of @d2? */ +static bool +is_ancestor(struct wim_dentry *d1, struct wim_dentry *d2) +{ + for (;;) { + if (d2 == d1) + return true; + if (dentry_is_root(d2)) + return false; + d2 = d2->parent; + } +} + /* Rename a file or directory in the WIM. * * This returns a -errno value. @@ -1003,29 +984,29 @@ rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to, return -ENOTDIR; } + /* @src can't be an ancestor of @dst. Otherwise we're unlinking @src + * from the tree and creating a loop... */ + if (is_ancestor(src, parent_of_dst)) + return -EBUSY; + if (j) { + if (dst) + if (journaled_unlink(j, dst)) + return -ENOMEM; + if (journaled_unlink(j, src)) + return -ENOMEM; if (journaled_change_name(j, src, path_basename(to))) return -ENOMEM; + if (journaled_link(j, src, parent_of_dst)) + return -ENOMEM; } else { ret = dentry_set_name(src, path_basename(to)); if (ret) return -ENOMEM; - } - if (dst) { - if (j) { - if (journaled_unlink(j, dst)) - return -ENOMEM; - } else { + if (dst) { unlink_dentry(dst); free_dentry_tree(dst, wim->lookup_table); } - } - if (j) { - if (journaled_unlink(j, src)) - return -ENOMEM; - if (journaled_link(j, src, parent_of_dst)) - return -ENOMEM; - } else { unlink_dentry(src); dentry_add_child(parent_of_dst, src); } @@ -1059,6 +1040,9 @@ execute_rename_command(struct update_command_journal *j, ret = WIMLIB_ERR_NOTDIR; break; case ENOTEMPTY: + case EBUSY: + /* XXX: EBUSY is returned when the rename would create a + * loop. It maybe should have its own error code. */ ret = WIMLIB_ERR_NOTEMPTY; break; case EISDIR: @@ -1124,7 +1108,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; @@ -1232,20 +1216,19 @@ check_add_command(struct wimlib_update_command *cmd, WIMLIB_ADD_FLAG_NO_REPLACE)) 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, - * although it could potentially be an overlay on an existing root as - * well. */ - bool is_entire_image = cmd->add.wim_target_path[0] == T('\0'); + bool is_entire_image = WIMLIB_IS_WIM_ROOT_PATH(cmd->add.wim_target_path); -#ifdef __WIN32__ - /* Check for flags not supported on Windows */ +#ifndef WITH_NTFS_3G if (add_flags & WIMLIB_ADD_FLAG_NTFS) { - ERROR("wimlib was compiled without support for NTFS-3g, so"); - ERROR("we cannot capture a WIM image directly from a NTFS volume"); + ERROR("wimlib was compiled without support for NTFS-3g, so\n" + " we cannot capture a WIM image directly " + "from an NTFS volume"); return WIMLIB_ERR_UNSUPPORTED; } +#endif + +#ifdef __WIN32__ + /* 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; @@ -1285,7 +1268,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; } @@ -1354,9 +1337,7 @@ free_update_commands(struct wimlib_update_command *cmds, size_t num_cmds) for (size_t i = 0; i < num_cmds; i++) { switch (cmds[i].op) { case WIMLIB_UPDATE_OP_ADD: - FREE(cmds[i].add.fs_source_path); FREE(cmds[i].add.wim_target_path); - FREE(cmds[i].add.config_file); break; case WIMLIB_UPDATE_OP_DELETE: FREE(cmds[i].delete_.wim_path); @@ -1387,18 +1368,12 @@ copy_update_commands(const struct wimlib_update_command *cmds, cmds_copy[i].op = cmds[i].op; switch (cmds[i].op) { case WIMLIB_UPDATE_OP_ADD: - cmds_copy[i].add.fs_source_path = - canonicalize_fs_path(cmds[i].add.fs_source_path); + cmds_copy[i].add.fs_source_path = cmds[i].add.fs_source_path; cmds_copy[i].add.wim_target_path = canonicalize_wim_path(cmds[i].add.wim_target_path); - if (!cmds_copy[i].add.fs_source_path || - !cmds_copy[i].add.wim_target_path) + if (!cmds_copy[i].add.wim_target_path) goto oom; - if (cmds[i].add.config_file) { - cmds_copy[i].add.config_file = TSTRDUP(cmds[i].add.config_file); - if (!cmds_copy[i].add.config_file) - goto oom; - } + cmds_copy[i].add.config_file = cmds[i].add.config_file; cmds_copy[i].add.add_flags = cmds[i].add.add_flags; break; case WIMLIB_UPDATE_OP_DELETE: @@ -1498,3 +1473,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, NULL); +} + +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); +}