From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 21 May 2013 05:26:08 +0000 (-0500)
Subject: ntfs-3g_capture.c: Allow multiple empty unnamed streams
X-Git-Tag: v1.4.1~66
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=ed8c19061f11e8448abd73289e996a0067d9fb71;ds=sidebyside

ntfs-3g_capture.c: Allow multiple empty unnamed streams
---

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 757c9d3e..978c2b49 100644
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -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 */