wimlib: Clean up code that sends capture progress messages

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index d7a289a3a0dd5f6ffe253e0b5c37b776b87ce63a..10093a0cec7241db63c37862edc2b57108deaf1d 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -134,7 +134,7 @@ attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch,
        /* Walk the path to the branch, creating filler directories as needed.
         * */
        parent = *root_p;
-       while ((slash = tstrchr(target_path, T('/')))) {
+       while ((slash = tstrchr(target_path, WIM_PATH_SEPARATOR))) {
                *slash = T('\0');
                dentry = get_dentry_child_with_name(parent, target_path);
                if (!dentry) {
@@ -150,7 +150,7 @@ attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch,
                 * trailing slashes were tripped.  */
                do {
                        ++target_path;
-               } while (*target_path == T('/'));
+               } while (*target_path == WIM_PATH_SEPARATOR);
        }
 
        /* If the target path already existed, overlay the branch onto it.
@@ -180,7 +180,6 @@ execute_add_command(WIMStruct *wim,
        int (*capture_tree)(struct wim_dentry **,
                            const tchar *,
                            struct add_image_params *);
-       union wimlib_progress_info progress;
        struct wimlib_capture_config *config;
 #ifdef WITH_NTFS_3G
        struct _ntfs_volume *ntfs_vol = NULL;
@@ -190,6 +189,7 @@ execute_add_command(WIMStruct *wim,
        bool rollback_sd = true;
 
        wimlib_assert(add_cmd->op == WIMLIB_UPDATE_OP_ADD);
+
        add_flags = add_cmd->add.add_flags;
        fs_source_path = add_cmd->add.fs_source_path;
        wim_target_path = add_cmd->add.wim_target_path;
@@ -197,6 +197,8 @@ execute_add_command(WIMStruct *wim,
        DEBUG("fs_source_path=\"%"TS"\", wim_target_path=\"%"TS"\", add_flags=%#x",
              fs_source_path, wim_target_path, add_flags);
 
+       memset(&params, 0, sizeof(params));
+
        imd = wim->image_metadata[wim->current_image - 1];
 
        if (add_flags & WIMLIB_ADD_FLAG_NTFS) {
@@ -221,6 +223,7 @@ execute_add_command(WIMStruct *wim,
                extra_arg = NULL;
        }
 
+
        ret = init_inode_table(&params.inode_table, 9001);
        if (ret)
                goto out;
@@ -234,20 +237,20 @@ execute_add_command(WIMStruct *wim,
        params.lookup_table = wim->lookup_table;
        params.config = config;
        params.add_flags = add_flags;
-       params.progress_func = progress_func;
        params.extra_arg = extra_arg;
 
-       if (progress_func) {
-               memset(&progress, 0, sizeof(progress));
-               progress.scan.source = fs_source_path;
-               progress.scan.wim_target_path = wim_target_path;
-               progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress);
+       params.progress_func = progress_func;
+       params.progress.scan.source = fs_source_path;
+       params.progress.scan.wim_target_path = wim_target_path;
+       if (progress_func)
+               progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &params.progress);
+       if (config) {
+               config->_prefix = fs_source_path;
+               config->_prefix_num_tchars = tstrlen(fs_source_path);
        }
-       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;
+               params.add_flags |= WIMLIB_ADD_FLAG_ROOT;
        ret = (*capture_tree)(&branch, fs_source_path, &params);
        if (ret) {
                ERROR("Failed to build dentry tree for \"%"TS"\"",
@@ -269,7 +272,7 @@ execute_add_command(WIMStruct *wim,
                        goto out_ntfs_umount;
        }
        if (progress_func)
-               progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress);
+               progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &params.progress);
        list_splice_tail(&unhashed_streams, &imd->unhashed_streams);
 #ifdef WITH_NTFS_3G
        imd->ntfs_vol = ntfs_vol;
@@ -468,12 +471,23 @@ static int
 execute_update_commands(WIMStruct *wim,
                        const struct wimlib_update_command *cmds,
                        size_t num_cmds,
+                       int update_flags,
                        wimlib_progress_func_t progress_func)
 {
        int ret = 0;
+       union wimlib_progress_info info;
+       info.update.completed_commands = 0;
+       info.update.total_commands = num_cmds;
        for (size_t i = 0; i < num_cmds; i++) {
                DEBUG("Executing update command %zu of %zu (op=%"TS")",
                      i + 1, num_cmds, update_op_to_str(cmds[i].op));
+               if (update_flags & WIMLIB_UPDATE_FLAG_SEND_PROGRESS &&
+                   progress_func)
+               {
+                       info.update.command = &cmds[i];
+                       (*progress_func)(WIMLIB_PROGRESS_MSG_UPDATE_BEGIN_COMMAND,
+                                        &info);
+               }
                switch (cmds[i].op) {
                case WIMLIB_UPDATE_OP_ADD:
                        ret = execute_add_command(wim, &cmds[i], progress_func);
@@ -489,6 +503,13 @@ execute_update_commands(WIMStruct *wim,
                }
                if (ret)
                        break;
+               info.update.completed_commands++;
+               if (update_flags & WIMLIB_UPDATE_FLAG_SEND_PROGRESS &&
+                   progress_func)
+               {
+                       (*progress_func)(WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND,
+                                        &info);
+               }
        }
        return ret;
 }
@@ -684,9 +705,7 @@ err:
        goto out;
 }
 
-/*
- * Entry point for making a series of updates to a WIM image.
- */
+/* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_update_image(WIMStruct *wim,
                    int image,
@@ -697,15 +716,21 @@ wimlib_update_image(WIMStruct *wim,
 {
        int ret;
        struct wimlib_update_command *cmds_copy;
+       bool deletion_requested = false;
 
        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;
+       for (size_t i = 0; i < num_cmds; i++)
+               if (cmds[i].op == WIMLIB_UPDATE_OP_DELETE)
+                       deletion_requested = true;
+
+       if (deletion_requested)
+               ret = can_delete_from_wim(wim);
+       else
+               ret = can_modify_wim(wim);
+
+       if (ret)
                goto out;
-       }
 
        /* Load the metadata for the image to modify (if not loaded already) */
        ret = select_wim_image(wim, image);
@@ -735,7 +760,8 @@ wimlib_update_image(WIMStruct *wim,
 
        /* 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, update_flags,
+                                     progress_func);
        if (ret)
                goto out_free_cmds_copy;