X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fupdate_image.c;h=af784f99588f36878469388ae5973386510d72bc;hb=036c7da59a54e9a24b1afb917b4f9f10eee176ee;hp=c088c831786f18e7920c2667cb66f55b067a5169;hpb=e3dc3c76cf0896eb98f455f2538999d23f95b61a;p=wimlib

diff --git a/src/update_image.c b/src/update_image.c
index c088c831..af784f99 100644
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -386,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;
 
@@ -399,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;
@@ -453,36 +457,6 @@ rollback_update(struct update_command_journal *j)
 	free_update_command_journal(j);
 }
 
-/*
- * Set the name of @branch for placing it at @target in the WIM image.  This
- * assumes that @target is in "canonical form", as produced by
- * canonicalize_wim_path().
- *
- * Note: for the root target this produces the empty name.
- */
-static int
-set_branch_name(struct wim_dentry *branch, const utf16lechar *target)
-{
-	const utf16lechar *p;
-
-	/* Find end of string.  (We can assume it contains at least one
-	 * character, the leading slash.)   */
-	wimlib_assert(target[0] == cpu_to_le16(WIM_PATH_SEPARATOR));
-	p = target;
-	do {
-		p++;
-	} while (*p);
-
-	while (*(p - 1) != cpu_to_le16(WIM_PATH_SEPARATOR))
-		p--;
-
-
-	/* We're assuming no trailing slashes.  */
-	wimlib_assert(*p || p == &target[1]);
-
-	return dentry_set_name_utf16le(branch, p);
-}
-
 static int
 handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing,
 		struct update_command_journal *j,
@@ -569,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"
@@ -585,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;
@@ -592,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  */
@@ -607,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;
@@ -634,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  */
@@ -643,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);
 	}
 
@@ -678,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;
 
@@ -711,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;
 }
 
@@ -768,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,
@@ -1142,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;
 
@@ -1302,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;
 		}
@@ -1507,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);
+}