X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fupdate_image.c;h=b973c21d8a896ac1d4b28ba570f9bf197c144fb3;hb=55a72fc546978ea0502ef0d0eba73ffd6c3ee785;hp=ef5328059be12fc45fc0ff750c484d8ddf8b75a3;hpb=b5b9681794d1f5f13350e3567f6f6e74f5c779cf;p=wimlib diff --git a/src/update_image.c b/src/update_image.c index ef532805..b973c21d 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -1,33 +1,64 @@ /* - * 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/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" @@ -38,14 +69,6 @@ #include "wimlib/progress.h" #include "wimlib/xml.h" -#include -#include -#include - -#ifdef HAVE_ALLOCA_H -# include -#endif - /* Saved specification of a "primitive" update operation that was performed. */ struct update_primitive { enum { @@ -212,13 +235,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 @@ -362,7 +385,7 @@ journaled_unlink(struct update_command_journal *j, struct wim_dentry *subject) if (dentry_is_root(subject)) parent = NULL; else - parent = subject->parent; + parent = subject->d_parent; prim.type = UNLINK_DENTRY; prim.link.subject = subject; @@ -509,7 +532,7 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, return ret; } } - free_dentry(branch); + free_dentry_tree(branch, j->lookup_table); return 0; } else if (add_flags & WIMLIB_ADD_FLAG_NO_REPLACE) { /* Can't replace nondirectory file */ @@ -520,27 +543,29 @@ 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; + 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->_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; - - info.replace.path_in_wim = existing->_full_path; - return call_progress(progfunc, - WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM, - &info, progctx); + return journaled_link(j, branch, parent); } } @@ -764,7 +789,7 @@ execute_add_command(struct update_command_journal *j, 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 @@ -866,8 +891,6 @@ execute_add_command(struct update_command_journal *j, #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: @@ -934,7 +957,7 @@ is_ancestor(const struct wim_dentry *d1, const struct wim_dentry *d2) return true; if (dentry_is_root(d2)) return false; - d2 = d2->parent; + d2 = d2->d_parent; } } @@ -981,7 +1004,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); @@ -1150,7 +1173,6 @@ execute_update_commands(WIMStruct *wim, 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, @@ -1222,7 +1244,8 @@ 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)) return WIMLIB_ERR_INVALID_PARAM; bool is_entire_image = WIMLIB_IS_WIM_ROOT_PATH(cmd->add.wim_target_path); @@ -1434,14 +1457,6 @@ wimlib_update_image(WIMStruct *wim, 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) @@ -1475,18 +1490,17 @@ wimlib_update_image(WIMStruct *wim, * 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; } -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) @@ -1497,7 +1511,7 @@ wimlib_delete_path(WIMStruct *wim, int image, cmd.delete_.wim_path = (tchar *)path; cmd.delete_.delete_flags = delete_flags; - return update1(wim, image, &cmd); + return wimlib_update_image(wim, image, &cmd, 1, 0); } WIMLIBAPI int @@ -1511,7 +1525,7 @@ wimlib_rename_path(WIMStruct *wim, int image, cmd.rename.wim_target_path = (tchar *)dest_path; cmd.rename.rename_flags = 0; - return update1(wim, image, &cmd); + return wimlib_update_image(wim, image, &cmd, 1, 0); } WIMLIBAPI int @@ -1527,5 +1541,5 @@ wimlib_add_tree(WIMStruct *wim, int image, cmd.add.add_flags = add_flags; cmd.add.config_file = NULL; - return update1(wim, image, &cmd); + return wimlib_update_image(wim, image, &cmd, 1, 0); }