Path fixes/updates

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index e85cd60671fa4350c11e3f41fe7ce5e25b978757..763f4dc410948e95251537cf6c8cf6705980df3d 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -21,16 +21,22 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "dentry.h"
-#include "lookup_table.h"
-#include "security.h"
-#include "xml.h"
-#include <errno.h>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
-#ifdef __WIN32__
-#  include "win32.h"
+#include "wimlib/capture.h"
+#include "wimlib/dentry.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#ifdef WITH_NTFS_3G
+#  include "wimlib/ntfs_3g.h" /* for do_ntfs_umount() */
 #endif
+#include "wimlib/paths.h"
+#include "wimlib/xml.h"
+
+#include <errno.h>
 
 /* Overlays @branch onto @target, both of which must be directories. */
 static int
@@ -128,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) {
@@ -144,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.
@@ -237,11 +243,13 @@ execute_add_command(WIMStruct *wim,
                progress.scan.wim_target_path = wim_target_path;
                progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress);
        }
-       config->_prefix = fs_source_path;
-       config->_prefix_num_tchars = tstrlen(fs_source_path);
+       if (config) {
+               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"\"",
@@ -454,6 +462,7 @@ update_op_to_str(int op)
                return T("rename");
        default:
                wimlib_assert(0);
+               return NULL;
        }
 }
 
@@ -589,7 +598,7 @@ check_update_commands(struct wimlib_update_command *cmds, size_t num_cmds,
 }
 
 
-extern void
+static void
 free_update_commands(struct wimlib_update_command *cmds, size_t num_cmds)
 {
        if (cmds) {