X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=92f3b7e1eb72b240921d81ac7ccde8d5dce86f4f;hb=2b407220ac965c3de1042454ed5d59ad83275701;hp=17fa9f06902339cd36d39c640d5368c9542a7b8f;hpb=26c7f8bb32e4a32001d409f1693e0df016270ed5;p=wimlib

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 17fa9f06..92f3b7e1 100644
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -87,7 +87,7 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, u64 size,
 	int ret;
 	u8 buf[BUFFER_SIZE];
 
- 	ni = ntfs_pathname_to_inode(vol, NULL, loc->path);
+	ni = ntfs_pathname_to_inode(vol, NULL, loc->path);
 	if (!ni) {
 		ERROR_WITH_ERRNO("Can't find NTFS inode for \"%"TS"\"", loc->path);
 		ret = WIMLIB_ERR_NTFS_3G;
@@ -171,7 +171,7 @@ capture_ntfs_streams(struct wim_inode *inode,
 	int ret;
 	struct wim_lookup_table_entry *lte;
 
-	DEBUG2("Capturing NTFS data streams from `%s'", path);
+	DEBUG("Capturing NTFS data streams from `%s'", path);
 
 	/* Get context to search the streams of the NTFS file. */
 	actx = ntfs_attr_get_search_ctx(ni, NULL);
@@ -296,7 +296,7 @@ out_free_ntfs_loc:
 out_put_actx:
 	ntfs_attr_put_search_ctx(actx);
 	if (ret == 0)
-		DEBUG2("Successfully captured NTFS streams from \"%s\"", path);
+		DEBUG("Successfully captured NTFS streams from \"%s\"", path);
 	else
 		ERROR("Failed to capture NTFS streams from \"%s\"", path);
 	return ret;
@@ -535,17 +535,14 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 	le32 attributes;
 	int ret;
 	struct wim_dentry *root = NULL;
-	struct wim_inode *inode;
+	struct wim_inode *inode = NULL;
 	ATTR_TYPES stream_type;
 
-	params->progress.scan.cur_path = path;
-
 	if (exclude_path(path, path_len, params->config, false)) {
 		/* Exclude a file or directory tree based on the capture
-		 * configuration file */
-		do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED);
+		 * configuration file.  */
 		ret = 0;
-		goto out;
+		goto out_progress;
 	}
 
 	/* Get file attributes */
@@ -565,13 +562,12 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 			ret = WIMLIB_ERR_UNSUPPORTED_FILE;
 			goto out;
 		}
-		do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED);
+		params->progress.scan.cur_path = path;
+		do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL);
 		ret = 0;
 		goto out;
 	}
 
-	do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK);
-
 	/* Create a WIM dentry with an associated inode, which may be shared */
 	ret = inode_table_new_dentry(&params->inode_table,
 				     path_basename_with_len(path, path_len),
@@ -587,7 +583,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 	if (inode->i_nlink > 1) {
 		/* Shared inode; nothing more to do */
 		ret = 0;
-		goto out;
+		goto out_progress;
 	}
 
 	inode->i_creation_time    = le64_to_cpu(ni->creation_time);
@@ -638,6 +634,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 		if (ret)
 			goto out;
 	}
+	path[path_len] = '\0';
 
 	/* Reparse-point fixups are a no-op because in NTFS-3g capture mode we
 	 * only allow capturing an entire volume. */
@@ -681,6 +678,15 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 			DEBUG("No security ID for `%s'", path);
 		}
 	}
+	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 == 0)
 		*root_ret = root;