+ int ret;
+ struct wim_dentry *dentry;
+
+ DEBUG("Creating filler directory \"%"TS"\"", name);
+ ret = new_dentry_with_inode(name, &dentry);
+ if (ret == 0) {
+ /* Leave the inode number as 0 for now. The final inode number
+ * will be assigned later by assign_inode_numbers(). */
+ dentry->d_inode->i_resolved = 1;
+ dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
+ *dentry_ret = dentry;
+ }
+ return ret;
+}
+
+/* Transfers the children of @branch to @target. It is an error if @target is
+ * not a directory or if both @branch and @target contain a child dentry with
+ * the same name. */
+static int
+do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
+{
+ struct rb_root *rb_root;
+
+ DEBUG("Doing overlay \"%"WS"\" => \"%"WS"\"",
+ branch->file_name, target->file_name);
+
+ if (!dentry_is_directory(target)) {
+ ERROR("Cannot overlay directory \"%"WS"\" "
+ "over non-directory", branch->file_name);
+ return WIMLIB_ERR_INVALID_OVERLAY;
+ }
+
+ rb_root = &branch->d_inode->i_children;
+ while (rb_root->rb_node) { /* While @branch has children... */
+ struct wim_dentry *child = rbnode_dentry(rb_root->rb_node);
+ /* Move @child to the directory @target */
+ unlink_dentry(child);
+ if (!dentry_add_child(target, child)) {
+ /* Revert the change to avoid leaking the directory tree
+ * rooted at @child */
+ dentry_add_child(branch, child);
+ ERROR("Overlay error: file \"%"WS"\" already exists "
+ "as a child of \"%"WS"\"",
+ child->file_name, target->file_name);
+ return WIMLIB_ERR_INVALID_OVERLAY;
+ }
+ }
+ free_dentry(branch);
+ return 0;
+
+}
+
+/* Attach or overlay a branch onto the WIM image.
+ *
+ * @root_p:
+ * Pointer to the root of the WIM image, or pointer to NULL if it has not
+ * been created yet.
+ * @branch
+ * Branch to add.
+ * @target_path:
+ * Path in the WIM image to add the branch, with leading and trailing
+ * slashes stripped.
+ */
+static int
+attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch,
+ tchar *target_path)
+{
+ tchar *slash;
+ struct wim_dentry *dentry, *parent, *target;
+ int ret;
+
+ DEBUG("Attaching branch \"%"WS"\" => \"%"TS"\"",
+ branch->file_name, target_path);
+
+ if (*target_path == T('\0')) {
+ /* Target: root directory */
+ if (*root_p) {
+ /* Overlay on existing root */
+ return do_overlay(*root_p, branch);
+ } else {
+ /* Set as root */
+ *root_p = branch;
+ return 0;
+ }
+ }
+
+ /* Adding a non-root branch. Create root if it hasn't been created
+ * already. */
+ if (!*root_p) {
+ ret = new_filler_directory(T(""), root_p);
+ if (ret)
+ return ret;
+ }
+
+ /* Walk the path to the branch, creating filler directories as needed.
+ * */
+ parent = *root_p;
+ while ((slash = tstrchr(target_path, T('/')))) {
+ *slash = T('\0');
+ dentry = get_dentry_child_with_name(parent, target_path);
+ if (!dentry) {
+ ret = new_filler_directory(target_path, &dentry);
+ if (ret)
+ return ret;
+ dentry_add_child(parent, dentry);
+ }
+ parent = dentry;
+ target_path = slash;
+ /* Skip over slashes. Note: this cannot overrun the length of
+ * the string because the last character cannot be a slash, as
+ * trailing slashes were tripped. */
+ do {
+ ++target_path;
+ } while (*target_path == T('/'));
+ }
+
+ /* If the target path already existed, overlay the branch onto it.
+ * Otherwise, set the branch as the target path. */
+ target = get_dentry_child_with_utf16le_name(parent, branch->file_name,
+ branch->file_name_nbytes);
+ if (target) {
+ return do_overlay(target, branch);
+ } else {
+ dentry_add_child(parent, branch);
+ return 0;
+ }
+}
+
+WIMLIBAPI int
+wimlib_add_image_multisource(WIMStruct *w,
+ struct wimlib_capture_source *sources,
+ size_t num_sources,
+ const tchar *name,
+ const tchar *config_str,
+ size_t config_len,
+ int add_image_flags,
+ wimlib_progress_func_t progress_func)
+{
+ int (*capture_tree)(struct wim_dentry **,
+ const tchar *,
+ struct wim_lookup_table *,
+ struct sd_set *,