Report directory tree scan errors

[wimlib] / src / unix_capture.c

diff --git a/src/unix_capture.c b/src/unix_capture.c
index 753da47f05614a696ff20407661049cc49eb92a7..66cb4be20265133a647f425d63b8e3f81723d91b 100644 (file)
--- a/src/unix_capture.c
+++ b/src/unix_capture.c
@@ -121,6 +121,7 @@ unix_scan_regular_file(const char *path, u64 size, struct wim_inode *inode,
                return WIMLIB_ERR_NOMEM;
        }
        lte->file_on_disk = file_on_disk;
+       lte->file_inode = inode;
        lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
        lte->size = size;
        add_unhashed_stream(lte, inode, 0, unhashed_streams);
@@ -436,10 +437,12 @@ out_progress:
        else
                ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
 out:
-       if (likely(ret == 0))
-               *tree_ret = tree;
-       else
+       if (unlikely(ret)) {
                free_dentry_tree(tree, params->lookup_table);
+               tree = NULL;
+               ret = report_capture_error(params, ret, full_path);
+       }
+       *tree_ret = tree;
        return ret;
 }