* 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
int add_flags;
tchar *fs_source_path;
tchar *wim_target_path;
- struct wim_inode_table inode_table;
- struct sd_set sd_set;
struct wim_image_metadata *imd;
struct list_head unhashed_streams;
struct add_image_params params;
extra_arg = NULL;
}
- ret = init_inode_table(&inode_table, 9001);
+ ret = init_inode_table(¶ms.inode_table, 9001);
if (ret)
goto out;
- ret = init_sd_set(&sd_set, imd->security_data);
+ ret = init_sd_set(¶ms.sd_set, imd->security_data);
if (ret)
goto out_destroy_inode_table;
INIT_LIST_HEAD(&unhashed_streams);
wim->lookup_table->unhashed_streams = &unhashed_streams;
params.lookup_table = wim->lookup_table;
- params.inode_table = &inode_table;
- params.sd_set = &sd_set;
params.config = config;
params.add_flags = add_flags;
params.progress_func = progress_func;
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, ¶ms);
if (ret) {
ERROR("Failed to build dentry tree for \"%"TS"\"",
#ifdef WITH_NTFS_3G
imd->ntfs_vol = ntfs_vol;
#endif
- inode_table_prepare_inode_list(&inode_table, &imd->inode_list);
+ inode_table_prepare_inode_list(¶ms.inode_table, &imd->inode_list);
ret = 0;
rollback_sd = false;
if (add_flags & WIMLIB_ADD_FLAG_RPFIX)
#endif
free_dentry_tree(branch, wim->lookup_table);
out_destroy_sd_set:
- destroy_sd_set(&sd_set, rollback_sd);
+ destroy_sd_set(¶ms.sd_set, rollback_sd);
out_destroy_inode_table:
- destroy_inode_table(&inode_table);
+ destroy_inode_table(¶ms.inode_table);
out:
return ret;
}
return T("rename");
default:
wimlib_assert(0);
+ return NULL;
}
}
}
-extern void
+static void
free_update_commands(struct wimlib_update_command *cmds, size_t num_cmds)
{
if (cmds) {