X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fupdate_image.c;h=c24ee1947ba498b9edd0fe0284d4f4580840af14;hp=3e7613fcfa5dbc12e37a7bdd3985a1cc24b764cb;hb=fb38bf47c4be7488addb7f2767bb27ffc87e1ea3;hpb=8c502bdb549cddf3d42d56731467c45cc2b8e503 diff --git a/src/update_image.c b/src/update_image.c index 3e7613fc..c24ee194 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -1,49 +1,70 @@ /* - * update_image.c - Update a WIM image. + * update_image.c - see description below */ /* * Copyright (C) 2013, 2014 Eric Biggers * - * This file is part of wimlib, a library for working with WIM files. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at your option) - * any later version. - * - * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. * - * You should have received a copy of the GNU General Public License - * along with wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU Lesser General Public License + * along with this file; if not, see http://www.gnu.org/licenses/. + */ + +/* + * This file contains the implementation of wimlib_update_image(), which is one + * of the two ways by which library users can make changes to a WIM image. (The + * other way is by mounting an image read-write.) wimlib_update_image() is also + * used in the implementation of wimlib_add_image(), since "create a WIM image + * from this directory tree" is equivalent to "create an empty WIM image, then + * update it to add this directory tree as the root". + * + * wimlib_update_image() processes a list of commands passed to it. Currently, + * the following types of commands are supported: + * + * - Add a directory tree from an external source (filesystem or NTFS volume). + * This can be used to add new files or to replace existing files. + * - Delete a file or directory tree. + * - Rename a file or directory tree. + * + * Not supported are creating links to existing files or changing metadata of + * existing files. + * + * wimlib_update_image() is atomic. If it cannot complete successfully, then + * all changes are rolled back and the WIMStruct is left unchanged. Rollback is + * implemented by breaking the commands into primitive operations such as "link + * this dentry tree here" which can be undone by doing the opposite operations + * in reverse order. */ #ifdef HAVE_CONFIG_H # 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/xml.h" - -#include -#include -#include - -#ifdef HAVE_ALLOCA_H -# include -#endif +#include "wimlib/progress.h" +#include "wimlib/xml_windows.h" /* Saved specification of a "primitive" update operation that was performed. */ struct update_primitive { @@ -110,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. */ @@ -133,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; @@ -142,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]); @@ -160,9 +181,9 @@ free_update_command_journal(struct update_command_journal *j) /* Free orphaned dentry trees */ while (!list_empty(&j->orphans)) { orphan = list_first_entry(&j->orphans, - struct wim_dentry, tmp_list); - list_del(&orphan->tmp_list); - free_dentry_tree(orphan, j->lookup_table); + struct wim_dentry, d_tmp_list); + list_del(&orphan->d_tmp_list); + free_dentry_tree(orphan, j->blob_table); } for (size_t i = 0; i < j->num_cmds; i++) @@ -211,13 +232,13 @@ do_unlink(struct wim_dentry *subject, struct wim_dentry *parent, { if (parent) { /* Unlink @subject from its @parent. */ - wimlib_assert(subject->parent == parent); + wimlib_assert(subject->d_parent == parent); unlink_dentry(subject); } else { /* Unset @subject as the root of the image. */ *root_p = NULL; } - subject->parent = subject; + subject->d_parent = subject; } static void @@ -245,8 +266,8 @@ rollback_link(struct wim_dentry *subject, struct wim_dentry *parent, do_unlink(subject, parent, root_p); /* @subject is now unlinked. Add it to orphans. */ - list_add(&subject->tmp_list, orphans); - subject->is_orphan = 1; + list_add(&subject->d_tmp_list, orphans); + subject->d_is_orphan = 1; } /* Undo an unlink operation. */ @@ -258,8 +279,8 @@ rollback_unlink(struct wim_dentry *subject, struct wim_dentry *parent, do_link(subject, parent, root_p); /* @subject is no longer unlinked. Delete it from orphans. */ - list_del(&subject->tmp_list); - subject->is_orphan = 0; + list_del(&subject->d_tmp_list); + subject->d_is_orphan = 0; } /* Rollback a name change operation. */ @@ -271,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; @@ -294,13 +315,13 @@ rollback_update_primitive(const struct update_primitive *prim, break; case CHANGE_FILE_NAME: rollback_name_change(prim->name.old_name, - &prim->name.subject->file_name, - &prim->name.subject->file_name_nbytes); + &prim->name.subject->d_name, + &prim->name.subject->d_name_nbytes); break; case CHANGE_SHORT_NAME: rollback_name_change(prim->name.old_name, - &prim->name.subject->short_name, - &prim->name.subject->short_name_nbytes); + &prim->name.subject->d_short_name, + &prim->name.subject->d_short_name_nbytes); break; } } @@ -328,24 +349,22 @@ 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; do_link(subject, parent, j->root_p); - if (subject->is_orphan) { - list_del(&subject->tmp_list); - subject->is_orphan = 0; + if (subject->d_is_orphan) { + list_del(&subject->d_tmp_list); + subject->d_is_orphan = 0; } return 0; } @@ -356,21 +375,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, - }, - }; + parent = subject->d_parent; + + prim.type = UNLINK_DENTRY; + prim.link.subject = subject; + prim.link.parent = parent; ret = record_update_primitive(j, prim); if (ret) @@ -378,8 +394,8 @@ journaled_unlink(struct update_command_journal *j, struct wim_dentry *subject) do_unlink(subject, parent, j->root_p); - list_add(&subject->tmp_list, &j->orphans); - subject->is_orphan = 1; + list_add(&subject->d_tmp_list, &j->orphans); + subject->d_is_orphan = 1; return 0; } @@ -391,35 +407,39 @@ 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; prim.type = CHANGE_FILE_NAME; prim.name.subject = dentry; - prim.name.old_name = dentry->file_name; + prim.name.old_name = dentry->d_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; + dentry->d_name = new_name; + dentry->d_name_nbytes = new_name_nbytes; /* Clear the short name. */ prim.type = CHANGE_SHORT_NAME; prim.name.subject = dentry; - prim.name.old_name = dentry->short_name; + prim.name.old_name = dentry->d_short_name; ret = record_update_primitive(j, prim); if (ret) return ret; - dentry->short_name = NULL; - dentry->short_name_nbytes = 0; + dentry->d_short_name = NULL; + dentry->d_short_name_nbytes = 0; return 0; } @@ -458,28 +478,11 @@ 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, - 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); @@ -510,13 +513,14 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, existing_child = get_dentry_child_with_utf16le_name(existing, - new_child->file_name, - new_child->file_name_nbytes, + new_child->d_name, + new_child->d_name_nbytes, WIMLIB_CASE_PLATFORM_DEFAULT); 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); } @@ -525,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 */ @@ -537,40 +541,42 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, struct wim_dentry *parent; int ret; - parent = existing->parent; + parent = existing->d_parent; ret = calculate_dentry_full_path(existing); if (ret) return ret; - ret = journaled_unlink(j, existing); - if (ret) - return ret; + if (add_flags & WIMLIB_ADD_FLAG_VERBOSE) { + union wimlib_progress_info info; - ret = journaled_link(j, branch, parent); + info.replace.path_in_wim = existing->d_full_path; + ret = call_progress(progfunc, + WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM, + &info, progctx); + if (ret) + return ret; + } + + ret = journaled_unlink(j, 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; + return journaled_link(j, branch, parent); } } 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" @@ -578,6 +584,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 +592,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 +607,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 +635,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,17 +643,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); } @@ -667,46 +675,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); + STATIC_ASSERT(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); + free_dentry_tree(branch, j->blob_table); +out: return ret; } @@ -715,6 +712,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 +758,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, @@ -781,21 +779,16 @@ 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_blobs) { int ret; int add_flags; tchar *fs_source_path; tchar *wim_target_path; const tchar *config_file; - struct add_image_params params; + 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; @@ -803,76 +796,66 @@ execute_add_command(struct update_command_journal *j, wim_target_path = add_cmd->add.wim_target_path; config_file = add_cmd->add.config_file; - DEBUG("fs_source_path=\"%"TS"\", wim_target_path=\"%"TS"\", add_flags=%#x", - fs_source_path, wim_target_path, add_flags); - memset(¶ms, 0, sizeof(params)); - 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) { - ERROR("NTFS volume already set"); - ret = WIMLIB_ERR_INVALID_PARAM; - goto out; - } - #else - ret = WIMLIB_ERR_INVALID_PARAM; - goto out; - #endif - } +#ifdef WITH_NTFS_3G + if (add_flags & WIMLIB_ADD_FLAG_NTFS) + capture_tree = ntfs_3g_build_dentry_tree; +#endif ret = get_capture_config(config_file, &config, add_flags, fs_source_path); 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.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); - - config.prefix = fs_source_path; - config.prefix_num_tchars = tstrlen(fs_source_path); + ret = call_progress(params.progfunc, WIMLIB_PROGRESS_MSG_SCAN_BEGIN, + ¶ms.progress, params.progctx); + if (ret) + goto out_destroy_config; - 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) 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->blob_table); + goto out_destroy_config; + } - 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); 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.progress_func); + 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) && - wim_target_path[0] == T('\0')) + 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 @@ -880,25 +863,20 @@ 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); + ret = attach_branch(branch, wimboot_cfgfile, j, 0, NULL, NULL); if (ret) - goto out_cleanup_after_capture; + goto out_destroy_config; + } + + if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path)) { + ret = set_windows_specific_info(wim); + if (ret) + goto out_destroy_config; } -#ifdef WITH_NTFS_3G - wim_get_current_image_metadata(wim)->ntfs_vol = ntfs_vol; -#endif - if (add_flags & WIMLIB_ADD_FLAG_RPFIX) - wim->hdr.flags |= WIM_HDR_FLAG_RP_FIX; 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: @@ -917,8 +895,6 @@ execute_delete_command(struct update_command_journal *j, 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, WIMLIB_CASE_PLATFORM_DEFAULT); if (!tree) { /* Path to delete does not exist in the WIM. */ @@ -944,21 +920,21 @@ execute_delete_command(struct update_command_journal *j, static int free_dentry_full_path(struct wim_dentry *dentry, void *_ignore) { - FREE(dentry->_full_path); - dentry->_full_path = NULL; + FREE(dentry->d_full_path); + dentry->d_full_path = NULL; return 0; } /* 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) return true; if (dentry_is_root(d2)) return false; - d2 = d2->parent; + d2 = d2->d_parent; } } @@ -1005,7 +981,7 @@ rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to, if (dentry_has_children(dst)) return -ENOTEMPTY; } - parent_of_dst = dst->parent; + parent_of_dst = dst->d_parent; } else { /* Destination does not exist */ parent_of_dst = get_parent_dentry(wim, to, case_type); @@ -1022,32 +998,27 @@ rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to, 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); + free_dentry_tree(dst, wim->blob_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); } - if (src->_full_path) + if (src->d_full_path) for_dentry_in_tree(src, free_dentry_full_path, NULL); return 0; } @@ -1094,22 +1065,6 @@ execute_rename_command(struct update_command_journal *j, return ret; } -static inline const tchar * -update_op_to_str(int op) -{ - switch (op) { - case WIMLIB_UPDATE_OP_ADD: - return T("add"); - case WIMLIB_UPDATE_OP_DELETE: - return T("delete"); - case WIMLIB_UPDATE_OP_RENAME: - return T("rename"); - default: - wimlib_assert(0); - return NULL; - } -} - static bool have_command_type(const struct wimlib_update_command *cmds, size_t num_cmds, enum wimlib_update_op op) @@ -1124,12 +1079,11 @@ 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; - struct list_head unhashed_streams; + struct list_head unhashed_blobs; struct update_command_journal *j; union wimlib_progress_info info; int ret; @@ -1145,11 +1099,11 @@ 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; - INIT_LIST_HEAD(&unhashed_streams); + INIT_LIST_HEAD(&unhashed_blobs); } else { inode_table = NULL; sd_set = NULL; @@ -1159,7 +1113,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; @@ -1169,21 +1123,19 @@ execute_update_commands(WIMStruct *wim, info.update.total_commands = num_cmds; ret = 0; 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_blobs); break; case WIMLIB_UPDATE_OP_DELETE: ret = execute_delete_command(j, wim, &cmds[i]); @@ -1195,11 +1147,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); } @@ -1210,7 +1163,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; @@ -1250,23 +1203,23 @@ check_add_command(struct wimlib_update_command *cmd, WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE | WIMLIB_ADD_FLAG_WINCONFIG | WIMLIB_ADD_FLAG_WIMBOOT | - WIMLIB_ADD_FLAG_NO_REPLACE)) + WIMLIB_ADD_FLAG_NO_REPLACE | + WIMLIB_ADD_FLAG_TEST_FILE_EXCLUSION | + WIMLIB_ADD_FLAG_SNAPSHOT)) 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("NTFS-3g capture mode is unsupported because wimlib " + "was compiled --without-ntfs-3g"); 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; @@ -1275,6 +1228,15 @@ check_add_command(struct wimlib_update_command *cmd, ERROR("Dereferencing symbolic links is not supported on Windows"); return WIMLIB_ERR_UNSUPPORTED; } +#else + /* Check for flags only supported on Windows. */ + + /* Currently, SNAPSHOT means Windows VSS. In the future, it perhaps + * could be implemented for other types of snapshots, such as btrfs. */ + if (add_flags & WIMLIB_ADD_FLAG_SNAPSHOT) { + ERROR("Snapshot mode is only supported on Windows, where it uses VSS."); + return WIMLIB_ERR_UNSUPPORTED; + } #endif /* VERBOSE implies EXCLUDE_VERBOSE */ @@ -1305,12 +1267,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 a 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!"); @@ -1375,9 +1331,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); @@ -1408,18 +1362,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: @@ -1461,31 +1409,26 @@ 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 wim_image_metadata *imd; struct wimlib_update_command *cmds_copy; if (update_flags & ~WIMLIB_UPDATE_FLAG_SEND_PROGRESS) return WIMLIB_ERR_INVALID_PARAM; - DEBUG("Updating image %d with %zu commands", image, num_cmds); - - if (have_command_type(cmds, num_cmds, WIMLIB_UPDATE_OP_DELETE)) - ret = can_delete_from_wim(wim); - else - ret = can_modify_wim(wim); - - if (ret) - goto out; - /* Load the metadata for the image to modify (if not loaded already) */ ret = select_wim_image(wim, image); if (ret) - goto out; + return ret; + + imd = wim->image_metadata[image - 1]; - DEBUG("Preparing %zu update commands", num_cmds); + /* Don't allow updating an image currently being shared by multiple + * WIMStructs (as a result of an export) */ + if (imd->refcnt > 1) + return WIMLIB_ERR_IMAGE_HAS_MULTIPLE_REFERENCES; /* Make a copy of the update commands, in the process doing certain * canonicalizations on paths (e.g. translating backslashes to forward @@ -1493,7 +1436,7 @@ wimlib_update_image(WIMStruct *wim, * commands. */ ret = copy_update_commands(cmds, num_cmds, &cmds_copy); if (ret) - goto out; + return ret; /* Perform additional checks on the update commands before we execute * them. */ @@ -1502,20 +1445,60 @@ wimlib_update_image(WIMStruct *wim, goto out_free_cmds_copy; /* 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; - wim->image_metadata[image - 1]->modified = 1; + mark_image_dirty(imd); - /* Statistics about the WIM image, such as the numbers of files and - * directories, may have changed. Call xml_update_image_info() to - * recalculate these statistics. */ - xml_update_image_info(wim, image); + for (size_t i = 0; i < num_cmds; i++) + if (cmds_copy[i].op == WIMLIB_UPDATE_OP_ADD && + cmds_copy[i].add.add_flags & WIMLIB_ADD_FLAG_RPFIX) + wim->hdr.flags |= WIM_HDR_FLAG_RP_FIX; out_free_cmds_copy: free_update_commands(cmds_copy, num_cmds); -out: return ret; } + +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 wimlib_update_image(wim, image, &cmd, 1, 0); +} + +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 wimlib_update_image(wim, image, &cmd, 1, 0); +} + +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 wimlib_update_image(wim, image, &cmd, 1, 0); +}