X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Funix_capture.c;h=151b0b47a16a96c8a0253312ab57171bec7c922a;hp=8fb4cba886af80b0b7abed9070add7d78dd1b8b6;hb=79d279cf4581fc0295576e33a28faf65686bee2c;hpb=daf72364fc96380cdc0d8ceeeda640d82930f1b9

diff --git a/src/unix_capture.c b/src/unix_capture.c
index 8fb4cba8..151b0b47 100644
--- a/src/unix_capture.c
+++ b/src/unix_capture.c
@@ -5,20 +5,18 @@
 /*
  * Copyright (C) 2012, 2013, 2014 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef __WIN32__
@@ -123,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);
@@ -134,13 +133,13 @@ static int
 unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
 				 char *path, size_t path_len,
 				 int dirfd, const char *relpath,
-				 struct add_image_params *params);
+				 struct capture_params *params);
 
 static int
 unix_scan_directory(struct wim_dentry *dir_dentry,
 		    char *full_path, size_t full_path_len,
 		    int parent_dirfd, const char *dir_relpath,
-		    struct add_image_params *params)
+		    struct capture_params *params)
 {
 
 	int dirfd;
@@ -251,9 +250,8 @@ 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,
-		  struct wim_inode *inode, struct add_image_params *params)
+unix_scan_symlink(const char *full_path, int dirfd, const char *relpath,
+		  struct wim_inode *inode, struct capture_params *params)
 {
 	char deref_name_buf[4096];
 	ssize_t deref_name_len;
@@ -281,31 +279,33 @@ unix_scan_symlink(struct wim_dentry **root_p, const char *full_path,
 	if ((params->add_flags & WIMLIB_ADD_FLAG_RPFIX) &&
 	     dest[0] == '/')
 	{
+		char *fixed_dest;
+
 		/* RPFIX (reparse point fixup) mode:  Change target of absolute
 		 * symbolic link to be "absolute" relative to the tree being
 		 * captured.  */
-		dest = unix_fixup_abslink(dest,
-					  params->capture_root_ino,
-					  params->capture_root_dev);
+		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 (dest) {
-			/* Successfully fixed the link target.  */
+		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);
-			if (ret)
-				return ret;
 		} else {
-			/* Link points outside of the tree being captured.
-			 * Exclude it.  */
-			free_dentry(*root_p);
-			*root_p = NULL;
-			return do_capture_progress(params,
-						   WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK,
-						   NULL);
+			/* Link points outside the tree being captured, so it
+			 * was not fixed.  */
+			ret = do_capture_progress(params,
+						  WIMLIB_SCAN_DENTRY_NOT_FIXED_SYMLINK,
+						  NULL);
 		}
+		if (ret)
+			return ret;
 	}
 	ret = wim_inode_set_symlink(inode, dest, params->lookup_table);
 	if (ret)
@@ -326,7 +326,7 @@ static int
 unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
 				 char *full_path, size_t full_path_len,
 				 int dirfd, const char *relpath,
-				 struct add_image_params *params)
+				 struct capture_params *params)
 {
 	struct wim_dentry *tree = NULL;
 	struct wim_inode *inode = NULL;
@@ -334,13 +334,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))
@@ -385,11 +383,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);
@@ -427,10 +423,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)
@@ -443,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;
 }
 
@@ -461,7 +457,7 @@ out:
  *
  * @root_disk_path:  The path to the root of the directory tree on disk.
  *
- * @params:     See doc for `struct add_image_params'.
+ * @params:     See doc for `struct capture_params'.
  *
  * @return:	0 on success, nonzero on failure.  It is a failure if any of
  *		the files cannot be `stat'ed, or if any of the needed
@@ -473,7 +469,7 @@ out:
 int
 unix_build_dentry_tree(struct wim_dentry **root_ret,
 		       const char *root_disk_path,
-		       struct add_image_params *params)
+		       struct capture_params *params)
 {
 	size_t path_len;
 	size_t path_bufsz;