X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fupdate_image.c;h=15458a12b51593984d00637d701abad8d13fe377;hb=da43effd1d1d4b8a502ad3fccc0b579131cc8c50;hp=f36f9ecf9c8436a52b23076aa18d901b3c5e084e;hpb=1fcf9333676be806716535d01b38722ee53d52e9;p=wimlib

diff --git a/src/update_image.c b/src/update_image.c
index f36f9ecf..15458a12 100644
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -64,7 +64,6 @@
 #include "wimlib/metadata.h"
 #include "wimlib/paths.h"
 #include "wimlib/progress.h"
-#include "wimlib/xml.h"
 
 /* Saved specification of a "primitive" update operation that was performed.  */
 struct update_primitive {
@@ -181,8 +180,8 @@ 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);
+					  struct wim_dentry, d_tmp_list);
+		list_del(&orphan->d_tmp_list);
 		free_dentry_tree(orphan, j->blob_table);
 	}
 
@@ -266,8 +265,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.  */
@@ -279,8 +278,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.  */
@@ -315,13 +314,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;
 	}
 }
@@ -362,9 +361,9 @@ journaled_link(struct update_command_journal *j,
 
 	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;
 }
@@ -394,8 +393,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;
 }
 
@@ -420,26 +419,26 @@ journaled_change_name(struct update_command_journal *j,
 
 	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) {
 		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;
 }
 
@@ -513,8 +512,8 @@ 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) {
@@ -550,7 +549,7 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing,
 		if (add_flags & WIMLIB_ADD_FLAG_VERBOSE) {
 			union wimlib_progress_info info;
 
-			info.replace.path_in_wim = existing->_full_path;
+			info.replace.path_in_wim = existing->d_full_path;
 			ret = call_progress(progfunc,
 					    WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM,
 					    &info, progctx);
@@ -689,7 +688,7 @@ attach_branch(struct wim_dentry *branch, const tchar *target_tstr,
 	if (ret)
 		goto out_free_branch;
 
-	BUILD_BUG_ON(WIM_PATH_SEPARATOR != OS_PREFERRED_PATH_SEPARATOR);
+	STATIC_ASSERT(WIM_PATH_SEPARATOR == OS_PREFERRED_PATH_SEPARATOR);
 	ret = dentry_set_name(branch, path_basename(target_tstr));
 	if (ret)
 		goto out_free_target;
@@ -796,14 +795,11 @@ 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(&params, 0, sizeof(params));
 
 #ifdef WITH_NTFS_3G
 	if (add_flags & WIMLIB_ADD_FLAG_NTFS)
-		capture_tree = build_dentry_tree_ntfs;
+		capture_tree = ntfs_3g_build_dentry_tree;
 #endif
 
 	ret = get_capture_config(config_file, &config,
@@ -892,8 +888,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. */
@@ -919,8 +913,8 @@ 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;
 }
 
@@ -1017,7 +1011,7 @@ rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to,
 		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;
 }
@@ -1064,22 +1058,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)
@@ -1138,8 +1116,6 @@ 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));
 		info.update.command = &cmds[i];
 		if (update_flags & WIMLIB_UPDATE_FLAG_SEND_PROGRESS) {
 			ret = call_progress(wim->progfunc,
@@ -1419,19 +1395,23 @@ wimlib_update_image(WIMStruct *wim,
 		    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);
-
 	/* 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
@@ -1439,7 +1419,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. */
@@ -1448,17 +1428,11 @@ 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);
 	if (ret)
 		goto out_free_cmds_copy;
 
-	wim->image_metadata[image - 1]->modified = 1;
-
-	/* 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);
+	mark_image_dirty(imd);
 
 	for (size_t i = 0; i < num_cmds; i++)
 		if (cmds_copy[i].op == WIMLIB_UPDATE_OP_ADD &&
@@ -1466,7 +1440,6 @@ wimlib_update_image(WIMStruct *wim,
 			wim->hdr.flags |= WIM_HDR_FLAG_RP_FIX;
 out_free_cmds_copy:
 	free_update_commands(cmds_copy, num_cmds);
-out:
 	return ret;
 }