X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-capture.c;h=9861523b081b8e200149eb818b25715ea065e193;hb=5ed5a1ef610700e463abd0c07aed377cce5eef47;hp=dcff1fe4e720f31bf4590e13c7cf604a5afbac9d;hpb=a2993f836221de10e3f3e220d38aa4b72d367a61;p=wimlib

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index dcff1fe4..9861523b 100644
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -222,6 +222,7 @@ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar,
 		if (ntfs_attr_pread(na, 0, 8, buf) != 8)
 			goto out_error;
 		*reparse_tag_ret = le32_to_cpu(*(u32*)buf);
+		DEBUG("ReparseTag = %#x", *reparse_tag_ret);
 		pos = 8;
 		bytes_remaining -= 8;
 	}
@@ -298,6 +299,9 @@ static int capture_ntfs_streams(struct wim_dentry *dentry, ntfs_inode *ni,
 			if (ret != 0)
 				goto out_put_actx;
 
+			if (type == AT_REPARSE_POINT)
+				dentry->d_inode->i_reparse_tag = reparse_tag;
+
 			/* Make a lookup table entry for the stream, or use an existing
 			 * one if there's already an identical stream. */
 			lte = __lookup_resource(lookup_table, attr_hash);
@@ -329,7 +333,6 @@ static int capture_ntfs_streams(struct wim_dentry *dentry, ntfs_inode *ni,
 				lte->ntfs_loc = ntfs_loc;
 				lte->resource_location = RESOURCE_IN_NTFS_VOLUME;
 				if (type == AT_REPARSE_POINT) {
-					dentry->d_inode->i_reparse_tag = reparse_tag;
 					ntfs_loc->is_reparse_point = true;
 					lte->resource_entry.original_size = data_size - 8;
 					lte->resource_entry.size = data_size - 8;
@@ -349,6 +352,7 @@ static int capture_ntfs_streams(struct wim_dentry *dentry, ntfs_inode *ni,
 		if (name_length == 0) {
 			/* Unnamed data stream.  Put the reference to it in the
 			 * dentry's inode. */
+		#if 0
 			if (dentry->d_inode->i_lte) {
 				ERROR("Found two un-named data streams for "
 				      "`%s'", path);
@@ -356,6 +360,15 @@ static int capture_ntfs_streams(struct wim_dentry *dentry, ntfs_inode *ni,
 				goto out_free_lte;
 			}
 			dentry->d_inode->i_lte = lte;
+		#else
+			if (dentry->d_inode->i_lte) {
+				WARNING("Found two un-named data streams for "
+					"`%s'", path);
+				free_lookup_table_entry(lte);
+			} else {
+				dentry->d_inode->i_lte = lte;
+			}
+		#endif
 		} else {
 			/* Named data stream.  Put the reference to it in the
 			 * alternate data stream entries */