check_add_command(): Use WIMLIB_ERR_UNSUPPORTED when appropriate

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index ce77c688f300b7f893b08096a567aa66ac1954b1..650dfbbd07fdf0726d3ce737085cdbf214eb9ae5 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -25,30 +25,9 @@
 #include "dentry.h"
 #include "lookup_table.h"
 #include "security.h"
 #include "dentry.h"
 #include "lookup_table.h"
 #include "security.h"

+#include "xml.h"

 #include <errno.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;
-}
-

 /* Overlays @branch onto @target, both of which must be directories. */
 static int
 do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
 /* Overlays @branch onto @target, both of which must be directories. */
 static int
 do_overlay(struct wim_dentry *target, struct wim_dentry *branch)


@@ -206,7 +185,7 @@ execute_add_command(WIMStruct *wim,
 
        imd = wim->image_metadata[wim->current_image - 1];
 
 
        imd = wim->image_metadata[wim->current_image - 1];
 

-       if (add_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
+       if (add_flags & WIMLIB_ADD_FLAG_NTFS) {

        #ifdef WITH_NTFS_3G
                capture_tree = build_dentry_tree_ntfs;
                extra_arg = &ntfs_vol;
        #ifdef WITH_NTFS_3G
                capture_tree = build_dentry_tree_ntfs;
                extra_arg = &ntfs_vol;


@@ -242,7 +221,7 @@ execute_add_command(WIMStruct *wim,
        params.inode_table = &inode_table;
        params.sd_set = &sd_set;
        params.config = config;
        params.inode_table = &inode_table;
        params.sd_set = &sd_set;
        params.config = config;

-       params.add_image_flags = add_flags;
+       params.add_flags = add_flags;

        params.progress_func = progress_func;
        params.extra_arg = extra_arg;
 
        params.progress_func = progress_func;
        params.extra_arg = extra_arg;
 


@@ -256,7 +235,7 @@ execute_add_command(WIMStruct *wim,
        config->_prefix_num_tchars = tstrlen(fs_source_path);
 
        if (wim_target_path[0] == T('\0'))
        config->_prefix_num_tchars = tstrlen(fs_source_path);
 
        if (wim_target_path[0] == T('\0'))

-               add_flags |= WIMLIB_ADD_IMAGE_FLAG_ROOT;
+               add_flags |= WIMLIB_ADD_FLAG_ROOT;

        ret = (*capture_tree)(&branch, fs_source_path, &params);
        if (ret) {
                ERROR("Failed to build dentry tree for \"%"TS"\"",
        ret = (*capture_tree)(&branch, fs_source_path, &params);
        if (ret) {
                ERROR("Failed to build dentry tree for \"%"TS"\"",


@@ -286,7 +265,7 @@ execute_add_command(WIMStruct *wim,
        inode_table_prepare_inode_list(&inode_table, &imd->inode_list);
        ret = 0;
        rollback_sd = false;
        inode_table_prepare_inode_list(&inode_table, &imd->inode_list);
        ret = 0;
        rollback_sd = false;

-       if (add_flags & WIMLIB_ADD_IMAGE_FLAG_RPFIX)
+       if (add_flags & WIMLIB_ADD_FLAG_RPFIX)

                wim->hdr.flags |= WIM_HDR_FLAG_RP_FIX;
        goto out_destroy_sd_set;
 out_ntfs_umount:
                wim->hdr.flags |= WIM_HDR_FLAG_RP_FIX;
        goto out_destroy_sd_set;
 out_ntfs_umount:


@@ -426,6 +405,8 @@ execute_rename_command(WIMStruct *wim,
                        ret = WIMLIB_ERR_NOTDIR;
                        break;
                case -ENOTEMPTY:
                        ret = WIMLIB_ERR_NOTDIR;
                        break;
                case -ENOTEMPTY:

+                       ret = WIMLIB_ERR_NOTEMPTY;
+                       break;

                case -EISDIR:
                        ret = WIMLIB_ERR_IS_DIRECTORY;
                        break;
                case -EISDIR:
                        ret = WIMLIB_ERR_IS_DIRECTORY;
                        break;


@@ -469,12 +450,14 @@ execute_update_commands(WIMStruct *wim,
                        break;
                case WIMLIB_UPDATE_OP_DELETE:
                        ret = execute_delete_command(wim, &cmds[i]);
                        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:
                        break;
                case WIMLIB_UPDATE_OP_RENAME:
                        ret = execute_rename_command(wim, &cmds[i]);
                        break;
                default:

-                       ret = WIMLIB_ERR_INVALID_PARAM;
+                       wimlib_assert(0);

                        break;
                }
                if (ret)
                        break;
                }
                if (ret)


@@ -488,64 +471,72 @@ check_add_command(struct wimlib_update_command *cmd,
                  const struct wim_header *hdr)
 {
        int add_flags = cmd->add.add_flags;
                  const struct wim_header *hdr)
 {
        int add_flags = cmd->add.add_flags;

+
+       /* Are we adding the entire image or not?  An empty wim_target_path
+        * indicates that the tree we're adding is to be placed in the root of
+        * the image.  We consider this to be capturing the entire image,
+        * although it could potentially be an overlay on an existing root as
+        * well. */

        bool is_entire_image = cmd->add.wim_target_path[0] == T('\0');
        bool is_entire_image = cmd->add.wim_target_path[0] == T('\0');

-       int ret;
+

 #ifdef __WIN32__
 #ifdef __WIN32__

-       if (add_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
+       /* Check for flags not supported on Windows */
+       if (add_flags & WIMLIB_ADD_FLAG_NTFS) {

                ERROR("wimlib was compiled without support for NTFS-3g, so");
                ERROR("we cannot capture a WIM image directly from a NTFS volume");
                return WIMLIB_ERR_UNSUPPORTED;
        }
                ERROR("wimlib was compiled without support for NTFS-3g, so");
                ERROR("we cannot capture a WIM image directly from a NTFS volume");
                return WIMLIB_ERR_UNSUPPORTED;
        }

-       if (add_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
+       if (add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {

                ERROR("Capturing UNIX-specific data is not supported on Windows");
                ERROR("Capturing UNIX-specific data is not supported on Windows");

-               return WIMLIB_ERR_INVALID_PARAM;
+               return WIMLIB_ERR_UNSUPPORTED;

        }
        }

-       if (add_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) {
+       if (add_flags & WIMLIB_ADD_FLAG_DEREFERENCE) {

                ERROR("Dereferencing symbolic links is not supported on Windows");
                ERROR("Dereferencing symbolic links is not supported on Windows");

-               return WIMLIB_ERR_INVALID_PARAM;
+               return WIMLIB_ERR_UNSUPPORTED;

        }
 #endif
 
        }
 #endif
 

-       if (add_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
-               add_flags |= WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE;
+       /* VERBOSE implies EXCLUDE_VERBOSE */
+       if (add_flags & WIMLIB_ADD_FLAG_VERBOSE)
+               add_flags |= WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE;

 
 

-       if ((add_flags & (WIMLIB_ADD_IMAGE_FLAG_RPFIX |
-                         WIMLIB_ADD_IMAGE_FLAG_NORPFIX)) ==
-               (WIMLIB_ADD_IMAGE_FLAG_RPFIX |
-                WIMLIB_ADD_IMAGE_FLAG_NORPFIX))
+       /* Check for contradictory reparse point fixup flags */
+       if ((add_flags & (WIMLIB_ADD_FLAG_RPFIX |
+                         WIMLIB_ADD_FLAG_NORPFIX)) ==
+               (WIMLIB_ADD_FLAG_RPFIX |
+                WIMLIB_ADD_FLAG_NORPFIX))

        {
                ERROR("Cannot specify RPFIX and NORPFIX flags "
                      "at the same time!");
                return WIMLIB_ERR_INVALID_PARAM;
        }
 
        {
                ERROR("Cannot specify RPFIX and NORPFIX flags "
                      "at the same time!");
                return WIMLIB_ERR_INVALID_PARAM;
        }
 

-       if ((add_flags & (WIMLIB_ADD_IMAGE_FLAG_RPFIX |
-                         WIMLIB_ADD_IMAGE_FLAG_NORPFIX)) == 0)
+       /* Set default behavior on reparse point fixups if requested */
+       if ((add_flags & (WIMLIB_ADD_FLAG_RPFIX |
+                         WIMLIB_ADD_FLAG_NORPFIX)) == 0)

        {
                /* Do reparse-point fixups by default if we are capturing an
                 * entire image and either the header flag is set from previous
                 * images, or if this is the first image being added. */
                if (is_entire_image &&
                    ((hdr->flags & WIM_HDR_FLAG_RP_FIX) || hdr->image_count == 1))
        {
                /* Do reparse-point fixups by default if we are capturing an
                 * entire image and either the header flag is set from previous
                 * images, or if this is the first image being added. */
                if (is_entire_image &&
                    ((hdr->flags & WIM_HDR_FLAG_RP_FIX) || hdr->image_count == 1))

-                       add_flags |= WIMLIB_ADD_IMAGE_FLAG_RPFIX;
+                       add_flags |= WIMLIB_ADD_FLAG_RPFIX;

        }
 
        if (!is_entire_image) {
        }
 
        if (!is_entire_image) {

-               if (add_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
+               if (add_flags & WIMLIB_ADD_FLAG_NTFS) {

                        ERROR("Cannot add directly from a NTFS volume "
                              "when not capturing a full image!");
                        return WIMLIB_ERR_INVALID_PARAM;
                }
 
                        ERROR("Cannot add directly from a NTFS volume "
                              "when not capturing a full image!");
                        return WIMLIB_ERR_INVALID_PARAM;
                }
 

-               if (add_flags & WIMLIB_ADD_IMAGE_FLAG_RPFIX) {
+               if (add_flags & WIMLIB_ADD_FLAG_RPFIX) {

                        ERROR("Cannot do reparse point fixups when "
                              "not capturing a full image!");
                        return WIMLIB_ERR_INVALID_PARAM;
                }
        }
                        ERROR("Cannot do reparse point fixups when "
                              "not capturing a full image!");
                        return WIMLIB_ERR_INVALID_PARAM;
                }
        }

-       ret = canonicalize_capture_config(cmd->add.config);
-       if (ret)
-               return ret;
+       /* We may have modified the add flags. */

        cmd->add.add_flags = add_flags;
        return 0;
 }
        cmd->add.add_flags = add_flags;
        return 0;
 }


@@ -615,6 +606,7 @@ copy_update_commands(const struct wimlib_update_command *cmds,
                goto oom;
 
        for (size_t i = 0; i < num_cmds; i++) {
                goto oom;
 
        for (size_t i = 0; i < num_cmds; i++) {

+               cmds_copy[i].op = cmds[i].op;

                switch (cmds[i].op) {
                case WIMLIB_UPDATE_OP_ADD:
                        cmds_copy[i].add.fs_source_path =
                switch (cmds[i].op) {
                case WIMLIB_UPDATE_OP_ADD:
                        cmds_copy[i].add.fs_source_path =


@@ -625,10 +617,10 @@ copy_update_commands(const struct wimlib_update_command *cmds,
                            !cmds_copy[i].add.wim_target_path)
                                goto oom;
                        if (cmds[i].add.config) {
                            !cmds_copy[i].add.wim_target_path)
                                goto oom;
                        if (cmds[i].add.config) {

-                               cmds_copy[i].add.config =
-                                       copy_capture_config(cmds[i].add.config);
-                               if (!cmds_copy[i].add.config)
-                                       goto oom;
+                               ret = copy_and_canonicalize_capture_config(cmds[i].add.config,
+                                                                          &cmds_copy[i].add.config);
+                               if (ret)
+                                       goto err;

                        }
                        cmds_copy[i].add.add_flags = cmds[i].add.add_flags;
                        break;
                        }
                        cmds_copy[i].add.add_flags = cmds[i].add.add_flags;
                        break;


@@ -665,6 +657,9 @@ err:
        goto out;
 }
 
        goto out;
 }
 

+/*
+ * Entry point for making a series of updates to a WIM image.
+ */

 WIMLIBAPI int
 wimlib_update_image(WIMStruct *wim,
                    int image,
 WIMLIBAPI int
 wimlib_update_image(WIMStruct *wim,
                    int image,


@@ -678,35 +673,51 @@ wimlib_update_image(WIMStruct *wim,
 
        DEBUG("Updating image %d with %zu commands", image, num_cmds);
 
 
        DEBUG("Updating image %d with %zu commands", image, num_cmds);
 

+       /* Refuse to update a split WIM. */

        if (wim->hdr.total_parts != 1) {
                ERROR("Cannot update a split WIM!");
                ret = WIMLIB_ERR_SPLIT_UNSUPPORTED;
                goto out;
        }
 
        if (wim->hdr.total_parts != 1) {
                ERROR("Cannot update a split WIM!");
                ret = WIMLIB_ERR_SPLIT_UNSUPPORTED;
                goto out;
        }
 

+       /* Load the metadata for the image to modify (if not loaded already) */

        ret = select_wim_image(wim, image);
        if (ret)
                goto out;
 
        ret = select_wim_image(wim, image);
        if (ret)
                goto out;
 

-       DEBUG("Selected image %d for update", image);
-
+       /* Short circuit a successful return if no commands were specified.
+        * Avoids problems with trying to allocate 0 bytes of memory. */

        if (num_cmds == 0)
                goto out;
 
        if (num_cmds == 0)
                goto out;
 

-       DEBUG("Preparing update commands");
+       DEBUG("Preparing %zu update commands", num_cmds);

 
 

+       /* Make a copy of the update commands, in the process doing certain
+        * canonicalizations on paths (e.g. translating backslashes to forward
+        * slashes).  This is done to avoid modifying the caller's copy of the
+        * commands. */

        ret = copy_update_commands(cmds, num_cmds, &cmds_copy);
        if (ret)
                goto out;
 
        ret = copy_update_commands(cmds, num_cmds, &cmds_copy);
        if (ret)
                goto out;
 

+       /* Perform additional checks on the update commands before we execute
+        * them. */

        ret = check_update_commands(cmds_copy, num_cmds, &wim->hdr);
        if (ret)
                goto out_free_cmds_copy;
 
        ret = check_update_commands(cmds_copy, num_cmds, &wim->hdr);
        if (ret)
                goto out_free_cmds_copy;
 

-       DEBUG("Executing update commands");
-
+       /* Actually execute the update commands. */
+       DEBUG("Executing %zu update commands", num_cmds);

        ret = execute_update_commands(wim, cmds_copy, num_cmds, progress_func);
        ret = execute_update_commands(wim, cmds_copy, num_cmds, progress_func);

+       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);

 out_free_cmds_copy:
        free_update_commands(cmds_copy, num_cmds);
 out:
 out_free_cmds_copy:
        free_update_commands(cmds_copy, num_cmds);
 out: