X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Funix_capture.c;h=3b22a2c07142eb1333cc5db12906dc6e57d5b72b;hb=439beeac4b861e7a95169d7d4397acddb440e73a;hp=0d9b3998094c6902194cf87c6990ee8d0e7b50b1;hpb=7a013be24d13570d28fea34c1c8c1f10ee3d653f;p=wimlib

diff --git a/src/unix_capture.c b/src/unix_capture.c
index 0d9b3998..3b22a2c0 100644
--- a/src/unix_capture.c
+++ b/src/unix_capture.c
@@ -163,14 +163,17 @@ unix_capture_symlink(struct wim_dentry **root_p,
 			dest = capture_fixup_absolute_symlink(dest,
 							      params->capture_root_ino,
 							      params->capture_root_dev);
-			if (!dest) {
-				WARNING("Ignoring out of tree absolute symlink "
-					"\"%s\" -> \"%s\"\n"
-					"          (Use --norpfix to capture "
-					"absolute symlinks as-is)",
-					path, deref_name_buf);
+			if (dest == NULL) {
+				/* 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 = path;
+				params->progress.scan.symlink_target = deref_name_buf;
+				do_capture_progress(params,
+						    WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK,
+						    NULL);
 				return 0;
 			}
 			inode->i_not_rpfixed = 0;
@@ -203,7 +206,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 {
 	struct wim_dentry *root = NULL;
 	int ret;
-	struct wim_inode *inode;
+	struct wim_inode *inode = NULL;
 	struct stat stbuf;
 
 	if (exclude_path(path, path_len, params->config, true)) {
@@ -278,8 +281,11 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 						inode, params->lookup_table);
 	else if (S_ISDIR(stbuf.st_mode))
 		ret = unix_capture_directory(root, path, path_len, params);
-	else
+	else {
 		ret = unix_capture_symlink(&root, path, inode, params);
+		if (root == NULL)
+			goto out;
+	}
 
 	if (ret)
 		goto out;