X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=f59292924f75afa5b2f1b0de9020fd47e34de7f2;hb=26ba6eaef7f310b682513696930013225f658044;hp=bbf6749f16a4284b3e4fd9850ce9ecd4f5385017;hpb=e9fa56fa6e181ae15282a2fcf0dbfa0b7c59cd81;p=wimlib

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index bbf6749f..f5929292 100644
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -199,7 +199,7 @@ capture_ntfs_streams(struct wim_inode *inode,
 	actx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!actx) {
 		ERROR_WITH_ERRNO("Cannot get NTFS attribute search "
-				 "context");
+				 "context for \"%s\"", path);
 		return WIMLIB_ERR_NTFS_3G;
 	}
 
@@ -247,8 +247,8 @@ capture_ntfs_streams(struct wim_inode *inode,
 			ntfs_loc = NULL;
 			if (type == AT_REPARSE_POINT) {
 				if (data_size < 8) {
-					ERROR("Invalid reparse data (only %u bytes)!",
-					      (unsigned)data_size);
+					ERROR("Invalid reparse data on \"%s\" "
+					      "(only %u bytes)!", path, (unsigned)data_size);
 					ret = WIMLIB_ERR_NTFS_3G;
 					goto out_free_lte;
 				}
@@ -267,13 +267,18 @@ capture_ntfs_streams(struct wim_inode *inode,
 			/* Unnamed data stream.  Put the reference to it in the
 			 * dentry's inode. */
 			if (inode->i_lte) {
-				ERROR("Found two un-named data streams for `%s'",
-				      path);
-				ret = WIMLIB_ERR_NTFS_3G;
-				goto out_free_lte;
+				if (lte) {
+					ERROR("Found two un-named data streams for \"%s\" "
+					      "(sizes = %"PRIu64", %"PRIu64")",
+					      path, wim_resource_size(inode->i_lte),
+					      wim_resource_size(lte));
+					ret = WIMLIB_ERR_NTFS_3G;
+					goto out_free_lte;
+				}
+			} else {
+				stream_id = 0;
+				inode->i_lte = lte;
 			}
-			stream_id = 0;
-			inode->i_lte = lte;
 		} else {
 			/* Named data stream.  Put the reference to it in the
 			 * alternate data stream entries */
@@ -298,8 +303,7 @@ capture_ntfs_streams(struct wim_inode *inode,
 	if (errno == ENOENT) {
 		ret = 0;
 	} else {
-		ERROR_WITH_ERRNO("Error listing NTFS attributes from `%s'",
-				 path);
+		ERROR_WITH_ERRNO("Error listing NTFS attributes of \"%s\"", path);
 		ret = WIMLIB_ERR_NTFS_3G;
 	}
 	goto out_put_actx;
@@ -314,9 +318,9 @@ out_free_ntfs_loc:
 out_put_actx:
 	ntfs_attr_put_search_ctx(actx);
 	if (ret == 0)
-		DEBUG2("Successfully captured NTFS streams from `%s'", path);
+		DEBUG2("Successfully captured NTFS streams from \"%s\"", path);
 	else
-		ERROR("Failed to capture NTFS streams from `%s'", path);
+		ERROR("Failed to capture NTFS streams from \"%s\"", path);
 	return ret;
 }
 
@@ -511,8 +515,12 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
 	 * directory tree rooted at it */
 	ntfs_inode *ni = ntfs_inode_open(ctx->dir_ni->vol, mref);
 	if (!ni) {
-		ERROR_WITH_ERRNO("Failed to open NTFS inode");
-		ret = -1;
+		/* XXX This used to be treated as an error, but NTFS-3g seemed
+		 * to be unable to read some inodes on a Windows 8 image for
+		 * some reason. */
+		WARNING_WITH_ERRNO("Failed to open NTFS file \"%s/%s\"",
+				   ctx->path, mbs_name);
+		ret = 0;
 		goto out_free_mbs_name;
 	}
 	path_len = ctx->path_len;
@@ -524,12 +532,14 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
 	ret = build_dentry_tree_ntfs_recursive(&child, ctx->dir_ni,
 					       ni, ctx->path, path_len, name_type,
 					       ctx->vol, ctx->params);
+	path_len -= mbs_name_nbytes + 1;
 	if (child)
 		dentry_add_child(ctx->parent, child);
 	ntfs_inode_close(ni);
 out_free_mbs_name:
 	FREE(mbs_name);
 out:
+	ctx->path[ctx->path_len] = '\0';
 	return ret;
 }
 
@@ -577,8 +587,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 					 ni, dir_ni, (char *)&attributes,
 					 sizeof(attributes));
 	if (ret != sizeof(attributes)) {
-		ERROR_WITH_ERRNO("Failed to get NTFS attributes from `%s'",
-				 path);
+		ERROR_WITH_ERRNO("Failed to get NTFS attributes from \"%s\"", path);
 		return WIMLIB_ERR_NTFS_3G;
 	}
 
@@ -644,7 +653,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 		};
 		ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir);
 		if (ret) {
-			ERROR_WITH_ERRNO("ntfs_readdir()");
+			ERROR_WITH_ERRNO("Error reading directory \"%s\"", path);
 			ret = WIMLIB_ERR_NTFS_3G;
 		} else {
 			ret = for_dentry_child(root, set_dentry_dos_name,