* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
-#include "wimlib_internal.h"
-#include "dentry.h"
-#include "lookup_table.h"
-#include "security.h"
-#include "xml.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "wimlib/capture.h"
+#include "wimlib/dentry.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 <errno.h>
/* Overlays @branch onto @target, both of which must be directories. */
}
rb_root = &branch->d_inode->i_children;
+ LIST_HEAD(moved_children);
while (rb_root->rb_node) { /* While @branch has children... */
struct wim_dentry *child = rbnode_dentry(rb_root->rb_node);
struct wim_dentry *existing;
int ret;
ret = do_overlay(existing, child);
if (ret) {
- /* Overlay failed. Revert the change to avoid
- * leaking the directory tree rooted at @child.
- * */
+ /* Overlay failed. Revert the changes. */
dentry_add_child(branch, child);
+ list_for_each_entry(child, &moved_children, tmp_list)
+ {
+ unlink_dentry(child);
+ dentry_add_child(branch, child);
+ }
return ret;
}
+ } else {
+ list_add(&child->tmp_list, &moved_children);
}
}
free_dentry(branch);
int add_flags;
tchar *fs_source_path;
tchar *wim_target_path;
- struct wim_inode_table inode_table;
- struct sd_set sd_set;
struct wim_image_metadata *imd;
struct list_head unhashed_streams;
struct add_image_params params;
extra_arg = NULL;
}
- ret = init_inode_table(&inode_table, 9001);
+ ret = init_inode_table(¶ms.inode_table, 9001);
if (ret)
goto out;
- ret = init_sd_set(&sd_set, imd->security_data);
+ ret = init_sd_set(¶ms.sd_set, imd->security_data);
if (ret)
goto out_destroy_inode_table;
INIT_LIST_HEAD(&unhashed_streams);
wim->lookup_table->unhashed_streams = &unhashed_streams;
params.lookup_table = wim->lookup_table;
- params.inode_table = &inode_table;
- params.sd_set = &sd_set;
params.config = config;
params.add_flags = add_flags;
params.progress_func = progress_func;
progress.scan.wim_target_path = wim_target_path;
progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress);
}
- config->_prefix = fs_source_path;
- config->_prefix_num_tchars = tstrlen(fs_source_path);
+ if (config) {
+ config->_prefix = fs_source_path;
+ config->_prefix_num_tchars = tstrlen(fs_source_path);
+ }
if (wim_target_path[0] == T('\0'))
add_flags |= WIMLIB_ADD_FLAG_ROOT;
#ifdef WITH_NTFS_3G
imd->ntfs_vol = ntfs_vol;
#endif
- inode_table_prepare_inode_list(&inode_table, &imd->inode_list);
+ inode_table_prepare_inode_list(¶ms.inode_table, &imd->inode_list);
ret = 0;
rollback_sd = false;
if (add_flags & WIMLIB_ADD_FLAG_RPFIX)
#endif
free_dentry_tree(branch, wim->lookup_table);
out_destroy_sd_set:
- destroy_sd_set(&sd_set, rollback_sd);
+ destroy_sd_set(¶ms.sd_set, rollback_sd);
out_destroy_inode_table:
- destroy_inode_table(&inode_table);
+ destroy_inode_table(¶ms.inode_table);
out:
return ret;
}
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);
if (!tree) {
/* Path to delete does not exist in the WIM. */
return 0;
}
-/*
+static int
+free_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
+{
+ FREE(dentry->_full_path);
+ dentry->_full_path = NULL;
+ return 0;
+}
+
+/*
* Rename a file or directory in the WIM.
*
* This is also called from wimfs_rename() in the FUSE mount code.
}
unlink_dentry(src);
dentry_add_child(parent_of_dst, src);
+ if (src->_full_path)
+ for_dentry_in_tree(src, free_dentry_full_path, NULL);
return 0;
}
ret = rename_wim_path(wim, rename_cmd->rename.wim_source_path,
rename_cmd->rename.wim_target_path);
if (ret) {
+ ret = -ret;
+ errno = ret;
+ ERROR_WITH_ERRNO("Can't rename \"%"TS"\" to \"%"TS"\"",
+ rename_cmd->rename.wim_source_path,
+ rename_cmd->rename.wim_target_path);
switch (ret) {
- case -ENOMEM:
+ case ENOMEM:
ret = WIMLIB_ERR_NOMEM;
break;
- case -ENOTDIR:
+ case ENOTDIR:
ret = WIMLIB_ERR_NOTDIR;
break;
- case -ENOTEMPTY:
+ case ENOTEMPTY:
ret = WIMLIB_ERR_NOTEMPTY;
break;
- case -EISDIR:
+ case EISDIR:
ret = WIMLIB_ERR_IS_DIRECTORY;
break;
- case -ENOENT:
+ case ENOENT:
default:
ret = WIMLIB_ERR_PATH_DOES_NOT_EXIST;
break;
case WIMLIB_UPDATE_OP_RENAME:
return T("rename");
default:
- return T("???");
+ wimlib_assert(0);
+ return NULL;
}
}
break;
case WIMLIB_UPDATE_OP_DELETE:
ret = execute_delete_command(wim, &cmds[i]);
- if (ret == 0)
- wim->deletion_occurred = 1;
break;
case WIMLIB_UPDATE_OP_RENAME:
ret = execute_rename_command(wim, &cmds[i]);
break;
default:
wimlib_assert(0);
- break;
}
if (ret)
break;
}
if (add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
ERROR("Capturing UNIX-specific data is not supported on Windows");
- return WIMLIB_ERR_INVALID_PARAM;
+ return WIMLIB_ERR_UNSUPPORTED;
}
if (add_flags & WIMLIB_ADD_FLAG_DEREFERENCE) {
ERROR("Dereferencing symbolic links is not supported on Windows");
- return WIMLIB_ERR_INVALID_PARAM;
+ return WIMLIB_ERR_UNSUPPORTED;
}
#endif
}
-extern void
+static void
free_update_commands(struct wimlib_update_command *cmds, size_t num_cmds)
{
if (cmds) {
for (size_t i = 0; i < num_cmds; i++) {
- switch (cmds->op) {
+ switch (cmds[i].op) {
case WIMLIB_UPDATE_OP_ADD:
FREE(cmds[i].add.fs_source_path);
FREE(cmds[i].add.wim_target_path);
git://wimlib.net / wimlib / blobdiff