rename_wim_path(): Free full paths in renamed trees

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index 6ad963f0620972d5f6b4f6c5126ee572928a7909..9453f2e02cf9d23bee7ae83861c18089e9974131 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -28,27 +28,9 @@
 #include "xml.h"
 #include <errno.h>
 
-/* Creates a new directory to place in the WIM image.  This is to create parent
- * directories that are not part of any target as needed.  */
-static int
-new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret)
-{
-       int ret;
-       struct wim_dentry *dentry;
-
-       DEBUG("Creating filler directory \"%"TS"\"", name);
-       ret = new_dentry_with_inode(name, &dentry);
-       if (ret)
-               goto out;
-       /* Leave the inode number as 0; this is allowed for non
-        * hard-linked files. */
-       dentry->d_inode->i_resolved = 1;
-       dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
-       *dentry_ret = dentry;
-       ret = 0;
-out:
-       return ret;
-}
+#ifdef __WIN32__
+#  include "win32.h"
+#endif
 
 /* Overlays @branch onto @target, both of which must be directories. */
 static int
@@ -66,6 +48,7 @@ do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
        }
 
        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;
@@ -79,12 +62,17 @@ do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
                        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);
@@ -317,6 +305,8 @@ execute_delete_command(WIMStruct *wim,
        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. */
@@ -344,7 +334,15 @@ execute_delete_command(WIMStruct *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.
@@ -404,6 +402,8 @@ 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)
+               for_dentry_in_tree(src, free_dentry_full_path, NULL);
        return 0;
 }
 
@@ -419,18 +419,25 @@ execute_rename_command(WIMStruct *wim,
        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 -EISDIR:
+               case ENOTEMPTY:
+                       ret = WIMLIB_ERR_NOTEMPTY;
+                       break;
+               case EISDIR:
                        ret = WIMLIB_ERR_IS_DIRECTORY;
                        break;
-               case -ENOENT:
+               case ENOENT:
                default:
                        ret = WIMLIB_ERR_PATH_DOES_NOT_EXIST;
                        break;
@@ -450,7 +457,7 @@ update_op_to_str(int op)
        case WIMLIB_UPDATE_OP_RENAME:
                return T("rename");
        default:
-               return T("???");
+               wimlib_assert(0);
        }
 }
 
@@ -470,19 +477,15 @@ execute_update_commands(WIMStruct *wim,
                        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:
-                       ret = WIMLIB_ERR_INVALID_PARAM;
-                       break;
+                       wimlib_assert(0);
                }
                if (ret)
                        break;
-               wim->image_metadata[wim->current_image - 1]->modified = 1;
        }
        return ret;
 }
@@ -509,11 +512,11 @@ check_add_command(struct wimlib_update_command *cmd,
        }
        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
 
@@ -595,7 +598,7 @@ 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);
@@ -733,10 +736,12 @@ wimlib_update_image(WIMStruct *wim,
        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, wim->current_image);
+       xml_update_image_info(wim, image);
 out_free_cmds_copy:
        free_update_commands(cmds_copy, num_cmds);
 out: