X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fntfs-capture.c;h=dfc153f9ecb01be1d35890b4cc2cbbf5fab56136;hb=0ea2bc5fcf915a313935c00a76d64aa60b5ae3c9;hp=5b6e315c3c913804206af93f64e2ea87eb8ec9ed;hpb=118cdc5cac01aad79e3314bf92cbbd924d48860c;p=wimlib

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index 5b6e315c..dfc153f9 100644
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -121,7 +121,7 @@ out_error:
 static int
 capture_ntfs_streams(struct wim_dentry *dentry,
 		     ntfs_inode *ni,
-		     mbchar *path,
+		     char *path,
 		     size_t path_len,
 		     struct wim_lookup_table *lookup_table,
 		     ntfs_volume **ntfs_vol_p,
@@ -391,7 +391,7 @@ destroy_dos_name_map(struct dos_name_map *map)
 struct readdir_ctx {
 	struct wim_dentry *parent;
 	ntfs_inode *dir_ni;
-	mbchar *path;
+	char *path;
 	size_t path_len;
 	struct wim_lookup_table	*lookup_table;
 	struct sd_set *sd_set;
@@ -403,8 +403,11 @@ struct readdir_ctx {
 };
 
 static int
-build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, ntfs_inode *dir_ni,
-				 ntfs_inode *ni, char path[], size_t path_len,
+build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
+				 ntfs_inode *dir_ni,
+				 ntfs_inode *ni,
+				 char *path,
+				 size_t path_len,
 				 int name_type,
 				 struct wim_lookup_table *lookup_table,
 				 struct sd_set *sd_set,
@@ -438,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;
 
@@ -491,7 +494,7 @@ static int
 build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
 				 ntfs_inode *dir_ni,
 				 ntfs_inode *ni,
-				 mbchar *path,
+				 char *path,
 				 size_t path_len,
 				 int name_type,
 				 struct wim_lookup_table *lookup_table,
@@ -599,43 +602,45 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
 	if (ret != 0)
 		return ret;
 
-	/* Get security descriptor */
-	char _sd[1];
-	char *sd = _sd;
-	errno = 0;
-	ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
-					 ni, dir_ni, sd,
-					 sizeof(sd));
-	if (ret > sizeof(sd)) {
-		sd = alloca(ret);
+	if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) {
+		/* Get security descriptor */
+		char _sd[1];
+		char *sd = _sd;
+		errno = 0;
 		ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
-						 ni, dir_ni, sd, ret);
-	}
-	if (ret > 0) {
-		root->d_inode->i_security_id = sd_set_add_sd(sd_set, sd, ret);
-		if (root->d_inode->i_security_id == -1) {
-			ERROR("Out of memory");
-			return WIMLIB_ERR_NOMEM;
+						 ni, dir_ni, sd,
+						 sizeof(sd));
+		if (ret > sizeof(sd)) {
+			sd = alloca(ret);
+			ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
+							 ni, dir_ni, sd, ret);
+		}
+		if (ret > 0) {
+			root->d_inode->i_security_id = sd_set_add_sd(sd_set, sd, ret);
+			if (root->d_inode->i_security_id == -1) {
+				ERROR("Out of memory");
+				return WIMLIB_ERR_NOMEM;
+			}
+			DEBUG("Added security ID = %u for `%s'",
+			      root->d_inode->i_security_id, path);
+			ret = 0;
+		} else if (ret < 0) {
+			ERROR_WITH_ERRNO("Failed to get security information from "
+					 "`%s'", path);
+			ret = WIMLIB_ERR_NTFS_3G;
+		} else {
+			root->d_inode->i_security_id = -1;
+			DEBUG("No security ID for `%s'", path);
 		}
-		DEBUG("Added security ID = %u for `%s'",
-		      root->d_inode->i_security_id, path);
-		ret = 0;
-	} else if (ret < 0) {
-		ERROR_WITH_ERRNO("Failed to get security information from "
-				 "`%s'", path);
-		ret = WIMLIB_ERR_NTFS_3G;
-	} else {
-		root->d_inode->i_security_id = -1;
-		DEBUG("No security ID for `%s'", path);
 	}
 	return ret;
 }
 
 int
 build_dentry_tree_ntfs(struct wim_dentry **root_p,
-		       const mbchar *device,
+		       const char *device,
 		       struct wim_lookup_table *lookup_table,
-		       struct wim_security_data *sd,
+		       struct sd_set *sd_set,
 		       const struct capture_config *config,
 		       int add_image_flags,
 		       wimlib_progress_func_t progress_func,
@@ -644,10 +649,6 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p,
 	ntfs_volume *vol;
 	ntfs_inode *root_ni;
 	int ret;
-	struct sd_set sd_set = {
-		.sd = sd,
-		.rb_root = {NULL},
-	};
 	ntfs_volume **ntfs_vol_p = extra_arg;
 
 	DEBUG("Mounting NTFS volume `%s' read-only", device);
@@ -682,7 +683,7 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p,
 
 	/* Currently we assume that all the paths fit into this length and there
 	 * is no check for overflow. */
-	mbchar *path = MALLOC(32768);
+	char *path = MALLOC(32768);
 	if (!path) {
 		ERROR("Could not allocate memory for NTFS pathname");
 		ret = WIMLIB_ERR_NOMEM;
@@ -693,14 +694,13 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p,
 	path[1] = '\0';
 	ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1,
 					       FILE_NAME_POSIX, lookup_table,
-					       &sd_set,
+					       sd_set,
 					       config, ntfs_vol_p,
 					       add_image_flags,
 					       progress_func);
 out_cleanup:
 	FREE(path);
 	ntfs_inode_close(root_ni);
-	destroy_sd_set(&sd_set);
 out:
 	ntfs_index_ctx_put(vol->secure_xsii);
 	ntfs_index_ctx_put(vol->secure_xsdh);