X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fupdate_image.c;h=b973c21d8a896ac1d4b28ba570f9bf197c144fb3;hb=ba9577d39906b70c591e4d898d5f05ca909d59e1;hp=f14775a714664a5b19c040cbce6a95e61f59800b;hpb=97235bb7c109f4a0d310007c5a38870f502df254;p=wimlib

diff --git a/src/update_image.c b/src/update_image.c
index f14775a7..b973c21d 100644
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -1,30 +1,60 @@
 /*
- * 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 <errno.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include "wimlib/alloca.h"
+#include "wimlib/assert.h"
 #include "wimlib/capture.h"
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
@@ -39,14 +69,6 @@
 #include "wimlib/progress.h"
 #include "wimlib/xml.h"
 
-#include <errno.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-
-#ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-#endif
-
 /* Saved specification of a "primitive" update operation that was performed.  */
 struct update_primitive {
 	enum {
@@ -510,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  */
@@ -767,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
@@ -869,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:
@@ -1437,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)
@@ -1478,6 +1490,11 @@ 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: