X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-capture.c;h=2647e2173851cd6e1360b3861b56af9abc2323f8;hb=fe6c34ebb7d5adeeceeed22142e080965d85a1eb;hp=31c8e56b513bec270bf857786fbf21ad4358383c;hpb=670a54f5de37bff02c49f37d690b26654cf7fa1d;p=wimlib

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index 31c8e56b..2647e217 100644
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -396,7 +396,7 @@ struct readdir_ctx {
 	struct wim_lookup_table	*lookup_table;
 	struct sd_set *sd_set;
 	struct dos_name_map *dos_name_map;
-	const struct capture_config *config;
+	const struct wimlib_capture_config *config;
 	ntfs_volume **ntfs_vol_p;
 	int add_image_flags;
 	wimlib_progress_func_t progress_func;
@@ -411,7 +411,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
 				 int name_type,
 				 struct wim_lookup_table *lookup_table,
 				 struct sd_set *sd_set,
-				 const struct capture_config *config,
+				 const struct wimlib_capture_config *config,
 				 ntfs_volume **ntfs_vol_p,
 				 int add_image_flags,
 				 wimlib_progress_func_t progress_func);
@@ -441,8 +441,8 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
 		if (ret != 0 || name_type == FILE_NAME_DOS)
 			goto out;
 	}
-	ret = utf16le_to_mbs(name, name_nbytes,
-			     &mbs_name, &mbs_name_nbytes);
+	ret = utf16le_to_tstr(name, name_nbytes,
+			      &mbs_name, &mbs_name_nbytes);
 	if (ret)
 		goto out;
 
@@ -499,7 +499,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
 				 int name_type,
 				 struct wim_lookup_table *lookup_table,
 				 struct sd_set *sd_set,
-				 const struct capture_config *config,
+				 const struct wimlib_capture_config *config,
 				 ntfs_volume **ntfs_vol_p,
 				 int add_image_flags,
 				 wimlib_progress_func_t progress_func)
@@ -508,10 +508,10 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
 	int ret;
 	struct wim_dentry *root;
 
-	if (exclude_path(path, config, false)) {
+	if (exclude_path(path, path_len, config, false)) {
 		/* Exclude a file or directory tree based on the capture
 		 * configuration file */
-		if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
+		if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE)
 		    && progress_func)
 		{
 			union wimlib_progress_info info;
@@ -546,7 +546,8 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
 	}
 
 	/* Create the new WIM dentry */
-	ret = new_dentry_with_timeless_inode(path_basename(path), &root);
+	ret = new_dentry_with_timeless_inode(path_basename_with_len(path, path_len),
+					     &root);
 	if (ret)
 		return ret;
 
@@ -641,7 +642,7 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p,
 		       const char *device,
 		       struct wim_lookup_table *lookup_table,
 		       struct sd_set *sd_set,
-		       const struct capture_config *config,
+		       const struct wimlib_capture_config *config,
 		       int add_image_flags,
 		       wimlib_progress_func_t progress_func,
 		       void *extra_arg)