check_add_command(): Use WIMLIB_ERR_UNSUPPORTED when appropriate
[wimlib] / src / update_image.c
index 9658392..650dfbb 100644 (file)
 #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;
-}
-
 /* Overlays @branch onto @target, both of which must be directories. */
 static int
 do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
@@ -207,7 +185,7 @@ execute_add_command(WIMStruct *wim,
 
        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;
@@ -243,7 +221,7 @@ execute_add_command(WIMStruct *wim,
        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;
 
@@ -257,7 +235,7 @@ execute_add_command(WIMStruct *wim,
        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"\"",
@@ -287,7 +265,7 @@ execute_add_command(WIMStruct *wim,
        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:
@@ -427,6 +405,8 @@ execute_rename_command(WIMStruct *wim,
                        ret = WIMLIB_ERR_NOTDIR;
                        break;
                case -ENOTEMPTY:
+                       ret = WIMLIB_ERR_NOTEMPTY;
+                       break;
                case -EISDIR:
                        ret = WIMLIB_ERR_IS_DIRECTORY;
                        break;
@@ -477,12 +457,11 @@ execute_update_commands(WIMStruct *wim,
                        ret = execute_rename_command(wim, &cmds[i]);
                        break;
                default:
-                       ret = WIMLIB_ERR_INVALID_PARAM;
+                       wimlib_assert(0);
                        break;
                }
                if (ret)
                        break;
-               wim->image_metadata[wim->current_image - 1]->modified = 1;
        }
        return ret;
 }
@@ -502,30 +481,30 @@ check_add_command(struct wimlib_update_command *cmd,
 
 #ifdef __WIN32__
        /* Check for flags not supported on Windows */
-       if (add_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
+       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;
        }
-       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");
-               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");
-               return WIMLIB_ERR_INVALID_PARAM;
+               return WIMLIB_ERR_UNSUPPORTED;
        }
 #endif
 
        /* VERBOSE implies EXCLUDE_VERBOSE */
-       if (add_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
-               add_flags |= WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE;
+       if (add_flags & WIMLIB_ADD_FLAG_VERBOSE)
+               add_flags |= WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE;
 
        /* Check for contradictory reparse point fixup flags */
-       if ((add_flags & (WIMLIB_ADD_IMAGE_FLAG_RPFIX |
-                         WIMLIB_ADD_IMAGE_FLAG_NORPFIX)) ==
-               (WIMLIB_ADD_IMAGE_FLAG_RPFIX |
-                WIMLIB_ADD_IMAGE_FLAG_NORPFIX))
+       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!");
@@ -533,30 +512,31 @@ check_add_command(struct wimlib_update_command *cmd,
        }
 
        /* Set default behavior on reparse point fixups if requested */
-       if ((add_flags & (WIMLIB_ADD_IMAGE_FLAG_RPFIX |
-                         WIMLIB_ADD_IMAGE_FLAG_NORPFIX)) == 0)
+       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))
-                       add_flags |= WIMLIB_ADD_IMAGE_FLAG_RPFIX;
+                       add_flags |= WIMLIB_ADD_FLAG_RPFIX;
        }
 
        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;
                }
 
-               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;
                }
        }
+       /* We may have modified the add flags. */
        cmd->add.add_flags = add_flags;
        return 0;
 }
@@ -732,10 +712,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: