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. */
+/* Overlays @branch onto @target, both of which must be directories. */
static int
do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
{
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);
+ if (!dentry_is_directory(branch) || !dentry_is_directory(target)) {
+ ERROR("Cannot overlay \"%"WS"\" onto existing dentry: "
+ "is not directory-on-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);
+ struct wim_dentry *existing;
+
/* 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;
+ existing = dentry_add_child(target, child);
+
+ /* File or directory with same name already exists */
+ if (existing) {
+ int ret;
+ ret = do_overlay(existing, child);
+ if (ret) {
+ /* Overlay failed. Revert the change to avoid
+ * leaking the directory tree rooted at @child.
+ * */
+ dentry_add_child(branch, child);
+ return ret;
+ }
}
}
free_dentry(branch);
return 0;
-
}
/* Attach or overlay a branch onto the WIM image.
* @parent: The dentry that will be the parent of @dentry.
* @dentry: The dentry to link.
*/
-bool
+struct wim_dentry *
dentry_add_child(struct wim_dentry * restrict parent,
struct wim_dentry * restrict child)
{
else if (result > 0)
new = &((*new)->rb_right);
else
- return false;
+ return this;
}
child->parent = parent;
rb_link_node(&child->rb_node, rb_parent, new);
rb_insert_color(&child->rb_node, root);
- return true;
+ return NULL;
}
/* Unlink a WIM dentry from the directory entry tree. */
fi
# Make sure source list mode is working as expected
+__msg "Testing source list capture mode"
rm -rf in.dir out.dir
mkdir in.dir
echo 1 > in.dir/1
imagex apply test.wim out.dir
if [[ ! -f out.dir/5 || ! -f out.dir/1 || ! -f out.dir/1link || \
! -f out.dir/otherdir/A || ! -f out.dir/otherdir/B ]]; then
- error "source list capture (with quoted names and overlay) failed to work as expected"
+ error "source list capture (with quoted names and basic overlay) failed to work as expected"
+fi
+
+# Try deep overlay
+rm -rf in.dir out.dir "overlay dir 1" "overlay dir 2"
+mkdir -p in.dir.1/subdir/subdir2 in.dir.2/subdir/subdir2
+cat > srclist << EOF
+in.dir.1 /
+in.dir.2 /
+EOF
+echo 1 > in.dir.1/subdir/1
+echo 2 > in.dir.2/subdir/2
+echo 3 > in.dir.1/subdir/subdir2/3
+echo 4 > in.dir.2/subdir/subdir2/4
+imagex capture srclist --source-list test.wim
+imagex apply test.wim out.dir
+if [[ ! -f out.dir/subdir/1 || ! -f out.dir/subdir/2 || \
+ ! -f out.dir/subdir/subdir2/3 || ! -f out.dir/subdir/subdir2/4 ]]; then
+ error "source list capture (with deep overlay) failed to work as expected"
+fi
+
+# Try bad overlay
+__msg "Testing bad overlay (errors expected)"
+rm -rf out.dir
+echo 5 > 5
+cat > srclist << EOF
+in.dir.1 /
+in.dir.2 /
+5 /subdir
+EOF
+if imagex capture srclist --source-list test.wim; then
+ error "unexpected success in bad overlay with --source-list!"
fi
echo "**********************************************************"