bt_matchfinder: make callers do max_len check

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index 82da53f4b3968fba37e2c252dbf41f7fe67f256d..2b2c107b2cd2198ba40c222db43253eead799b7e 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -550,7 +550,7 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing,
                if (add_flags & WIMLIB_ADD_FLAG_VERBOSE) {
                        union wimlib_progress_info info;
 
-                       info.replace.path_in_wim = existing->_full_path;
+                       info.replace.path_in_wim = existing->d_full_path;
                        ret = call_progress(progfunc,
                                            WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM,
                                            &info, progctx);
@@ -689,7 +689,7 @@ attach_branch(struct wim_dentry *branch, const tchar *target_tstr,
        if (ret)
                goto out_free_branch;
 
-       BUILD_BUG_ON(WIM_PATH_SEPARATOR != OS_PREFERRED_PATH_SEPARATOR);
+       STATIC_ASSERT(WIM_PATH_SEPARATOR == OS_PREFERRED_PATH_SEPARATOR);
        ret = dentry_set_name(branch, path_basename(target_tstr));
        if (ret)
                goto out_free_target;
@@ -796,9 +796,6 @@ execute_add_command(struct update_command_journal *j,
        wim_target_path = add_cmd->add.wim_target_path;
        config_file = add_cmd->add.config_file;
 
-       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));
 
 #ifdef WITH_NTFS_3G
@@ -892,8 +889,6 @@ execute_delete_command(struct update_command_journal *j,
        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, WIMLIB_CASE_PLATFORM_DEFAULT);
        if (!tree) {
                /* Path to delete does not exist in the WIM. */
@@ -919,8 +914,8 @@ execute_delete_command(struct update_command_journal *j,
 static int
 free_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
 {
-       FREE(dentry->_full_path);
-       dentry->_full_path = NULL;
+       FREE(dentry->d_full_path);
+       dentry->d_full_path = NULL;
        return 0;
 }
 
@@ -1017,7 +1012,7 @@ 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)
+       if (src->d_full_path)
                for_dentry_in_tree(src, free_dentry_full_path, NULL);
        return 0;
 }
@@ -1064,22 +1059,6 @@ execute_rename_command(struct update_command_journal *j,
        return ret;
 }
 
-static inline const tchar *
-update_op_to_str(int op)
-{
-       switch (op) {
-       case WIMLIB_UPDATE_OP_ADD:
-               return T("add");
-       case WIMLIB_UPDATE_OP_DELETE:
-               return T("delete");
-       case WIMLIB_UPDATE_OP_RENAME:
-               return T("rename");
-       default:
-               wimlib_assert(0);
-               return NULL;
-       }
-}
-
 static bool
 have_command_type(const struct wimlib_update_command *cmds, size_t num_cmds,
                  enum wimlib_update_op op)
@@ -1138,8 +1117,6 @@ execute_update_commands(WIMStruct *wim,
        info.update.total_commands = num_cmds;
        ret = 0;
        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));
                info.update.command = &cmds[i];
                if (update_flags & WIMLIB_UPDATE_FLAG_SEND_PROGRESS) {
                        ret = call_progress(wim->progfunc,
@@ -1424,15 +1401,11 @@ wimlib_update_image(WIMStruct *wim,
        if (update_flags & ~WIMLIB_UPDATE_FLAG_SEND_PROGRESS)
                return WIMLIB_ERR_INVALID_PARAM;
 
-       DEBUG("Updating image %d with %zu commands", image, num_cmds);
-
        /* Load the metadata for the image to modify (if not loaded already) */
        ret = select_wim_image(wim, image);
        if (ret)
                goto out;
 
-       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
@@ -1448,7 +1421,6 @@ wimlib_update_image(WIMStruct *wim,
                goto out_free_cmds_copy;
 
        /* Actually execute the update commands. */
-       DEBUG("Executing %zu update commands", num_cmds);
        ret = execute_update_commands(wim, cmds_copy, num_cmds, update_flags);
        if (ret)
                goto out_free_cmds_copy;