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 ba540c98237abbb41b1c9678c7c75ded74f0a470..ec2b3796482a85368f1dba338c110fda5c9ecfbc 100644 (file)
--- a/src/unix_capture.c
+++ b/src/unix_capture.c
@@ -251,8 +251,7 @@ unix_fixup_abslink(char *dest, u64 ino, u64 dev)
 }
 
 static int
-unix_scan_symlink(struct wim_dentry **root_p, const char *full_path,
-                 int dirfd, const char *relpath,
+unix_scan_symlink(const char *full_path, int dirfd, const char *relpath,
                  struct wim_inode *inode, struct add_image_params *params)
 {
        char deref_name_buf[4096];
@@ -281,22 +280,33 @@ unix_scan_symlink(struct wim_dentry **root_p, const char *full_path,
        if ((params->add_flags & WIMLIB_ADD_FLAG_RPFIX) &&
             dest[0] == '/')
        {
-               dest = unix_fixup_abslink(dest,
-                                         params->capture_root_ino,
-                                         params->capture_root_dev);
-               if (!dest) {
-                       /* RPFIX (reparse point fixup) mode:  Ignore
-                        * absolute symbolic link that points out of the
-                        * tree to be captured.  */
-                       free_dentry(*root_p);
-                       *root_p = NULL;
-                       params->progress.scan.cur_path = full_path;
-                       params->progress.scan.symlink_target = deref_name_buf;
-                       return do_capture_progress(params,
-                                                  WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK,
-                                                  NULL);
+               char *fixed_dest;
+
+               /* RPFIX (reparse point fixup) mode:  Change target of absolute
+                * symbolic link to be "absolute" relative to the tree being
+                * captured.  */
+               fixed_dest = unix_fixup_abslink(dest,
+                                               params->capture_root_ino,
+                                               params->capture_root_dev);
+               params->progress.scan.cur_path = full_path;
+               params->progress.scan.symlink_target = deref_name_buf;
+               if (fixed_dest) {
+                       /* Link points inside the tree being captured, so it was
+                        * fixed.  */
+                       inode->i_not_rpfixed = 0;
+                       dest = fixed_dest;
+                       ret = do_capture_progress(params,
+                                                 WIMLIB_SCAN_DENTRY_FIXED_SYMLINK,
+                                                 NULL);
+               } else {
+                       /* Link points outside the tree being captured, so it
+                        * was not fixed.  */
+                       ret = do_capture_progress(params,
+                                                 WIMLIB_SCAN_DENTRY_NOT_FIXED_SYMLINK,
+                                                 NULL);
                }
-               inode->i_not_rpfixed = 0;
+               if (ret)
+                       return ret;
        }
        ret = wim_inode_set_symlink(inode, dest, params->lookup_table);
        if (ret)
@@ -325,13 +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 = 0;
+       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))
@@ -376,11 +384,9 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
 
        inode = tree->d_inode;
 
-       if (inode->i_nlink > 1) {
-               /* Already seen this inode?  */
-               ret = 0;
+       /* Already seen this inode?  */
+       if (inode->i_nlink > 1)
                goto out_progress;
-       }
 
 #ifdef HAVE_STAT_NANOSECOND_PRECISION
        inode->i_creation_time = timespec_to_wim_timestamp(stbuf.st_mtim);
@@ -418,10 +424,8 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
                ret = unix_scan_directory(tree, full_path, full_path_len,
                                          dirfd, relpath, params);
        } else if (S_ISLNK(stbuf.st_mode)) {
-               ret = unix_scan_symlink(&tree, full_path, dirfd, relpath,
+               ret = unix_scan_symlink(full_path, dirfd, relpath,
                                        inode, params);
-               if (!tree)
-                       goto out;
        }
 
        if (ret)