Support for file exclusions via progress function

[wimlib] / src / unix_capture.c

diff --git a/src/unix_capture.c b/src/unix_capture.c
index 15e1d153923a0bedfee0603ee412b89552f2d44a..ec2b3796482a85368f1dba338c110fda5c9ecfbc 100644 (file)
--- a/src/unix_capture.c
+++ b/src/unix_capture.c
@@ -335,10 +335,11 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
        struct stat stbuf;
        int stat_flags;
 
-       if (should_exclude_path(full_path + params->capture_root_nchars,
-                               full_path_len - params->capture_root_nchars,
-                               params->config))
+       ret = try_exclude(full_path, full_path_len, params);
+       if (ret < 0) /* Excluded? */
                goto out_progress;
+       if (ret > 0) /* Error? */
+               goto out;
 
        if (params->add_flags & (WIMLIB_ADD_FLAG_DEREFERENCE |
                                 WIMLIB_ADD_FLAG_ROOT))