X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Funix_capture.c;h=3b22a2c07142eb1333cc5db12906dc6e57d5b72b;hb=f36b35733a7e0bdb6b3e1920d7e6893bd0dc4d55;hp=fe95b9a6b6c7173bca3e225a657b7d30136fc343;hpb=dfb714d9e4291b8fe7a8d4d955d42f8169ada770;p=wimlib

diff --git a/src/unix_capture.c b/src/unix_capture.c
index fe95b9a6..3b22a2c0 100644
--- a/src/unix_capture.c
+++ b/src/unix_capture.c
@@ -64,7 +64,7 @@ unix_capture_regular_file(const char *path,
 		}
 		lte->file_on_disk = file_on_disk;
 		lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
-		lte->resource_entry.original_size = size;
+		lte->size = size;
 		lookup_table_insert_unhashed(lookup_table, lte, inode, 0);
 		inode->i_lte = lte;
 	}
@@ -128,6 +128,7 @@ unix_capture_directory(struct wim_dentry *dir_dentry,
 		if (child)
 			dentry_add_child(dir_dentry, child);
 	}
+	path[path_len] = '\0';
 	closedir(dir);
 	return ret;
 }
@@ -162,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;
@@ -201,59 +205,40 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 				 struct add_image_params *params)
 {
 	struct wim_dentry *root = NULL;
-	int ret = 0;
-	struct wim_inode *inode;
+	int ret;
+	struct wim_inode *inode = NULL;
+	struct stat stbuf;
 
 	if (exclude_path(path, path_len, params->config, true)) {
-		if ((params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE)
-		    && params->progress_func)
-		{
-			union wimlib_progress_info info;
-			info.scan.cur_path = path;
-			info.scan.status = WIMLIB_SCAN_DENTRY_EXCLUDED;
-			params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
-		}
-		goto out;
-	}
-
-	if ((params->add_flags & WIMLIB_ADD_FLAG_VERBOSE)
-	    && params->progress_func)
-	{
-		union wimlib_progress_info info;
-		info.scan.cur_path = path;
-		info.scan.status = WIMLIB_SCAN_DENTRY_OK;
-		params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+		ret = 0;
+		goto out_progress;
 	}
 
-	struct stat stbuf;
-	int (*stat_fn)(const char *restrict, struct stat *restrict);
 	if ((params->add_flags & WIMLIB_ADD_FLAG_DEREFERENCE) ||
 	    (params->add_flags & WIMLIB_ADD_FLAG_ROOT))
-		stat_fn = stat;
+		ret = stat(path, &stbuf);
 	else
-		stat_fn = lstat;
+		ret = lstat(path, &stbuf);
 
-	ret = (*stat_fn)(path, &stbuf);
 	if (ret) {
-		ERROR_WITH_ERRNO("Failed to stat `%s'", path);
+		ERROR_WITH_ERRNO("Failed to stat \"%s\"", path);
 		ret = WIMLIB_ERR_STAT;
 		goto out;
 	}
-	if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode)
-	    && !S_ISLNK(stbuf.st_mode)) {
+
+	if (!S_ISREG(stbuf.st_mode) &&
+	    !S_ISDIR(stbuf.st_mode) &&
+	    !S_ISLNK(stbuf.st_mode))
+	{
 		if (params->add_flags & WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE)
 		{
 			ERROR("Can't archive unsupported file \"%s\"", path);
-			return WIMLIB_ERR_UNSUPPORTED_FILE;
-		}
-		if ((params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE)
-		    && params->progress_func)
-		{
-			union wimlib_progress_info info;
-			info.scan.cur_path = path;
-			info.scan.status = WIMLIB_SCAN_DENTRY_UNSUPPORTED;
-			params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+			ret = WIMLIB_ERR_UNSUPPORTED_FILE;
+			goto out;
 		}
+		params->progress.scan.cur_path = path;
+		do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL);
+		ret = 0;
 		goto out;
 	}
 
@@ -265,8 +250,11 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 
 	inode = root->d_inode;
 
-	if (inode->i_nlink > 1) /* Already captured this inode? */
-		goto out;
+	if (inode->i_nlink > 1) {
+		/* Already captured this inode? */
+		ret = 0;
+		goto out_progress;
+	}
 
 #ifdef HAVE_STAT_NANOSECOND_PRECISION
 	inode->i_creation_time = timespec_to_wim_timestamp(stbuf.st_mtim);
@@ -293,20 +281,33 @@ 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);
-out:
-	if (ret == 0)
-		*root_ret = root;
+		if (root == NULL)
+			goto out;
+	}
+
+	if (ret)
+		goto out;
+
+out_progress:
+	params->progress.scan.cur_path = path;
+	if (root == NULL)
+		do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
 	else
+		do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
+out:
+	if (ret)
 		free_dentry_tree(root, params->lookup_table);
+	else
+		*root_ret = root;
 	return ret;
 }
 
 /*
  * unix_build_dentry_tree():
- * 	Builds a tree of WIM dentries from an on-disk directory tree (UNIX
- * 	version; no NTFS-specific data is captured).
+ *	Builds a tree of WIM dentries from an on-disk directory tree (UNIX
+ *	version; no NTFS-specific data is captured).
  *
  * @root_ret:   Place to return a pointer to the root of the dentry tree.  Only
  *		modified if successful.  Set to NULL if the file or directory was
@@ -357,7 +358,7 @@ unix_build_dentry_tree(struct wim_dentry **root_ret,
 	if (path_len >= path_bufsz)
 		return WIMLIB_ERR_INVALID_PARAM;
 
- 	path_buf = MALLOC(path_bufsz);
+	path_buf = MALLOC(path_bufsz);
 	if (!path_buf)
 		return WIMLIB_ERR_NOMEM;
 	memcpy(path_buf, root_disk_path, path_len + 1);