add_image.c: Add debugging statements for branch attachment

diff --git a/src/add_image.c b/src/add_image.c
index 28ece7424720a3922887504590d4506d37b6b7dd..b5f8c06956e57e14172181da98eb1424cf2c98ca 100644 (file)
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -1328,9 +1328,8 @@ new_filler_directory(const char *name)
        DEBUG("Creating filler directory \"%s\"", name);
        dentry = new_dentry_with_inode(name);
        if (dentry) {
        DEBUG("Creating filler directory \"%s\"", name);
        dentry = new_dentry_with_inode(name);
        if (dentry) {

-               /* Set the inode number to 0 for now.  The final inode number
+               /* Leave the inode number as 0 for now.  The final inode number

                 * will be assigned later by assign_inode_numbers(). */
                 * will be assigned later by assign_inode_numbers(). */

-               dentry->d_inode->i_ino = 0;

                dentry->d_inode->i_resolved = 1;
                dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
        }
                dentry->d_inode->i_resolved = 1;
                dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
        }


@@ -1344,6 +1343,9 @@ static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
 {
        struct rb_root *rb_root;
 
 {
        struct rb_root *rb_root;
 

+       DEBUG("Doing overlay %s => %s",
+             branch->file_name_utf8, target->file_name_utf8);
+

        if (!dentry_is_directory(target)) {
                ERROR("Cannot overlay directory `%s' over non-directory",
                      branch->file_name_utf8);
        if (!dentry_is_directory(target)) {
                ERROR("Cannot overlay directory `%s' over non-directory",
                      branch->file_name_utf8);


@@ -1388,6 +1390,9 @@ static int attach_branch(struct wim_dentry **root_p,
        char *slash;
        struct wim_dentry *dentry, *parent, *target;
 
        char *slash;
        struct wim_dentry *dentry, *parent, *target;
 

+       DEBUG("Attaching branch \"%s\" => \"%s\"",
+             branch->file_name_utf8, target_path);
+

        if (*target_path == '\0') {
                /* Target: root directory */
                if (*root_p) {
        if (*target_path == '\0') {
                /* Target: root directory */
                if (*root_p) {