X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=11cbc9ddb9c288f28f59ad0f81b132a1d01d4b92;hb=5d3d469e410dc5f4a28814ad231336fc174cba56;hp=b6d9226276e7afe44f4d1ce3ad50a93933ad7c9a;hpb=e176e9731e696562bab8de7b9bd34c019deef3e8;p=wimlib

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index b6d92262..11cbc9dd 100644
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -155,14 +155,13 @@ out:
 
 }
 
-/* Load the streams from a file or reparse point in the NTFS volume into the WIM
- * lookup table */
+/* Load the streams from a file or reparse point in the NTFS volume  */
 static int
 capture_ntfs_streams(struct wim_inode *inode,
 		     ntfs_inode *ni,
 		     char *path,
 		     size_t path_len,
-		     struct wim_lookup_table *lookup_table,
+		     struct list_head *unhashed_streams,
 		     ntfs_volume *vol,
 		     ATTR_TYPES type)
 {
@@ -171,7 +170,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);
@@ -274,8 +273,8 @@ capture_ntfs_streams(struct wim_inode *inode,
 			new_ads_entry->lte = lte;
 		}
 		if (lte) {
-			lookup_table_insert_unhashed(lookup_table, lte,
-						     inode, stream_id);
+			add_unhashed_stream(lte, inode,
+					    stream_id, unhashed_streams);
 		}
 	}
 	if (errno == ENOENT) {
@@ -296,7 +295,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 +534,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 +561,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 +582,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);
@@ -609,7 +604,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 	 * - Reparse points: capture reparse data only
 	 */
 	ret = capture_ntfs_streams(inode, ni, path, path_len,
-				   params->lookup_table, vol, stream_type);
+				   params->unhashed_streams, vol, stream_type);
 	if (ret)
 		goto out;
 
@@ -638,6 +633,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 +677,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;