Misc. fixes

[wimlib] / src / ntfs-apply.c

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 3ac622919c683c674859777d0a20c0bff0fcd96f..d3457fb894bfc6677a1c75dcaac33cf4a7d5d9a0 100644 (file)
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -305,7 +305,8 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry,
                char orig;
                ntfs_volume *vol = (*dir_ni_p)->vol;
 
-               DEBUG("pre-applying DOS name `%s'", dentry_with_dos_name);
+               DEBUG("pre-applying DOS name `%s'",
+                     dentry_with_dos_name->full_path_utf8);
                ret = do_wim_apply_dentry_ntfs(dentry_with_dos_name,
                                               *dir_ni_p, w);
                if (ret != 0)
@@ -364,8 +365,11 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
                        if (other->extracted_file) {
                                ret = wim_apply_hardlink_ntfs(dentry, other,
                                                              dir_ni, &ni);
+                               is_hardlink = true;
                                if (ret != 0)
-                                       return ret;
+                                       goto out_close_dir_ni;
+                               else
+                                       goto out_set_dos_name;
                        }
                }
                /* Can't make a hard link */