X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fntfs-capture.c;h=fb670dc0183845e08f8e2349bc1c8b4cc6434295;hb=12f851cd2fbd19c6b9d5358756d4b7c0a9944b92;hp=a4f0b6ed7c2ce0e6748fa6100bb85817c7c24832;hpb=7231431086332de22b2556477bcc5fc2c3e4bdcf;p=wimlib

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index a4f0b6ed..fb670dc0 100644
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -204,11 +204,12 @@ static inline ntfschar *attr_record_name(ATTR_RECORD *ar)
  */
 static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar,
 			     u8 md[SHA1_HASH_SIZE],
+			     bool is_reparse_point,
 			     u32 *reparse_tag_ret)
 {
 	s64 pos = 0;
 	s64 bytes_remaining;
-	char buf[4096];
+	char buf[BUFFER_SIZE];
 	ntfs_attr *na;
 	SHA_CTX ctx;
 
@@ -220,19 +221,20 @@ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar,
 	}
 
 	bytes_remaining = na->data_size;
-	sha1_init(&ctx);
 
-	DEBUG2("Calculating SHA1 message digest (%"PRIu64" bytes)",
-	       bytes_remaining);
+	if (is_reparse_point) {
+		if (ntfs_attr_pread(na, 0, 8, buf) != 8)
+			goto out_error;
+		*reparse_tag_ret = le32_to_cpu(*(u32*)buf);
+		pos = 8;
+		bytes_remaining -= 8;
+	}
 
+	sha1_init(&ctx);
 	while (bytes_remaining) {
 		s64 to_read = min(bytes_remaining, sizeof(buf));
-		if (ntfs_attr_pread(na, pos, to_read, buf) != to_read) {
-			ERROR_WITH_ERRNO("Error reading NTFS attribute");
-			return WIMLIB_ERR_NTFS_3G;
-		}
-		if (bytes_remaining == na->data_size && reparse_tag_ret)
-			*reparse_tag_ret = le32_to_cpu(*(u32*)buf);
+		if (ntfs_attr_pread(na, pos, to_read, buf) != to_read)
+			goto out_error;
 		sha1_update(&ctx, buf, to_read);
 		pos += to_read;
 		bytes_remaining -= to_read;
@@ -240,10 +242,13 @@ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar,
 	sha1_final(md, &ctx);
 	ntfs_attr_close(na);
 	return 0;
+out_error:
+	ERROR_WITH_ERRNO("Error reading NTFS attribute");
+	return WIMLIB_ERR_NTFS_3G;
 }
 
-/* Load the streams from a WIM file or reparse point in the NTFS volume into the
- * WIM lookup table */
+/* Load the streams from a file or reparse point in the NTFS volume into the WIM
+ * lookup table */
 static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
 				char path[], size_t path_len,
 				struct lookup_table *lookup_table,
@@ -292,7 +297,8 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
 				goto out_put_actx;
 			}
 			/* Checksum the stream. */
-			ret = ntfs_attr_sha1sum(ni, actx->attr, attr_hash, &reparse_tag);
+			ret = ntfs_attr_sha1sum(ni, actx->attr, attr_hash,
+						type == AT_REPARSE_POINT, &reparse_tag);
 			if (ret != 0)
 				goto out_put_actx;
 
@@ -463,7 +469,7 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
 					       ctx->flags);
 
 	if (child)
-		link_dentry(child, ctx->parent);
+		dentry_add_child(ctx->parent, child);
 
 	ntfs_inode_close(ni);
 out_free_utf8_name: