X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-3g_apply.c;h=ccfd6fde54703b4531c7d3205d19987517f79c95;hp=07dbdf65094df0e05c865b202b455b5b2f3e18d0;hb=51df3b63c594a7e35446d2e2e19637e54240b0b2;hpb=c781da7cdafd01a81c3c6b0c99c5d1369f44ce63

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index 07dbdf65..ccfd6fde 100644
--- a/src/ntfs-3g_apply.c
+++ b/src/ntfs-3g_apply.c
@@ -322,15 +322,37 @@ ntfs_3g_restore_reparse_point(ntfs_inode *ni, const struct wim_inode *inode,
 	if (ntfs_set_ntfs_reparse_data(ni, (const char *)&ctx->rpbuf,
 				       REPARSE_DATA_OFFSET + blob_size, 0))
 	{
+		int err = errno;
 		ERROR_WITH_ERRNO("Failed to set reparse data on \"%s\"",
 				 dentry_full_path(
 					inode_first_extraction_dentry(inode)));
+		if (err == EINVAL && !(inode->i_reparse_tag & 0x80000000)) {
+			WARNING("This reparse point had a non-Microsoft reparse "
+				"tag.  The preceding error may have been caused "
+				"by a known bug in libntfs-3g where it does not "
+				"correctly validate non-Microsoft reparse "
+				"points.  This bug may be fixed in the 2016 "
+				"release of libntfs-3g.");
+		}
 		return WIMLIB_ERR_SET_REPARSE_DATA;
 	}
 
 	return 0;
 }
 
+static bool
+ntfs_3g_has_empty_attributes(const struct wim_inode *inode)
+{
+	for (unsigned i = 0; i < inode->i_num_streams; i++) {
+		const struct wim_inode_stream *strm = &inode->i_streams[i];
+
+		if (stream_blob_resolved(strm) == NULL &&
+		    (strm->stream_type == STREAM_TYPE_REPARSE_POINT ||
+		     stream_is_named_data_stream(strm)))
+			return true;
+	}
+	return false;
+}
 
 /*
  * Create empty attributes (named data streams and potentially a reparse point)
@@ -338,13 +360,14 @@ ntfs_3g_restore_reparse_point(ntfs_inode *ni, const struct wim_inode *inode,
  *
  * Since these won't have blob descriptors, they won't show up in the call to
  * extract_blob_list().  Hence the need for the special case.
+ *
+ * Keep this in sync with ntfs_3g_has_empty_attributes()!
  */
 static int
 ntfs_3g_create_empty_attributes(ntfs_inode *ni,
 				const struct wim_inode *inode,
 				struct ntfs_3g_apply_ctx *ctx)
 {
-
 	for (unsigned i = 0; i < inode->i_num_streams; i++) {
 
 		const struct wim_inode_stream *strm = &inode->i_streams[i];
@@ -432,7 +455,7 @@ ntfs_3g_set_metadata(ntfs_inode *ni, const struct wim_inode *inode,
 					"the security descriptor is invalid.  If you "
 					"are extracting a Windows 10 image, this may be "
 					"caused by a known bug in libntfs-3g.  See: "
-					"http://wimlib.net/forums/viewtopic.php?f=1&t=4 "
+					"https://wimlib.net/forums/viewtopic.php?f=1&t=4 "
 					"for more information.\n\n");
 			}
 			return ret;
@@ -480,8 +503,6 @@ ntfs_3g_create_dirs_recursive(ntfs_inode *dir_ni, struct wim_dentry *dir,
 		ret = report_file_created(&ctx->common);
 		if (!ret)
 			ret = ntfs_3g_set_metadata(ni, child->d_inode, ctx);
-		if (!ret)
-			ret = ntfs_3g_create_empty_attributes(ni, child->d_inode, ctx);
 		if (!ret)
 			ret = ntfs_3g_create_dirs_recursive(ni, child, ctx);
 
@@ -517,7 +538,9 @@ ntfs_3g_create_directories(struct wim_dentry *root,
 
 	root->d_inode->i_mft_no = FILE_root;
 
-	ret = ntfs_3g_create_dirs_recursive(root_ni, root, ctx);
+	ret = ntfs_3g_set_metadata(root_ni, root->d_inode, ctx);
+	if (!ret)
+		ret = ntfs_3g_create_dirs_recursive(root_ni, root, ctx);
 
 	if (ntfs_inode_close(root_ni) && !ret) {
 		ERROR_WITH_ERRNO("Error closing root of NTFS volume");
@@ -526,18 +549,44 @@ ntfs_3g_create_directories(struct wim_dentry *root,
 	if (ret)
 		return ret;
 
-	/* Set the DOS name of any directory that has one.  */
+	/* Set the DOS name of any directory that has one.  In addition, create
+	 * empty attributes for directories that have them.  Note that creating
+	 * an empty reparse point attribute must happen *after* setting the
+	 * DOS name in order to work around a case where
+	 * ntfs_set_ntfs_dos_name() fails with EOPNOTSUPP.  */
 	list_for_each_entry(dentry, dentry_list, d_extraction_list_node) {
-		if (!(dentry->d_inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY))
-			continue;
-		if (!dentry_has_short_name(dentry))
+		const struct wim_inode *inode = dentry->d_inode;
+
+		if (!(inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY))
 			continue;
-		ret = ntfs_3g_restore_dos_name(NULL, NULL, dentry, ctx->vol);
-		if (ret)
-			return ret;
-		ret = report_file_created(&ctx->common);
-		if (ret)
-			return ret;
+		if (dentry_has_short_name(dentry)) {
+			ret = ntfs_3g_restore_dos_name(NULL, NULL, dentry,
+						       ctx->vol);
+			if (ret)
+				return ret;
+			ret = report_file_created(&ctx->common);
+			if (ret)
+				return ret;
+		}
+		if (ntfs_3g_has_empty_attributes(inode)) {
+			ntfs_inode *ni;
+
+			ret = WIMLIB_ERR_NTFS_3G;
+			ni = ntfs_inode_open(ctx->vol, inode->i_mft_no);
+			if (ni) {
+				ret = ntfs_3g_create_empty_attributes(ni, inode,
+								      ctx);
+				if (ntfs_inode_close(ni) && !ret)
+					ret = WIMLIB_ERR_NTFS_3G;
+			}
+			if (ret) {
+				ERROR_WITH_ERRNO("Failed to create empty "
+						 "attributes of directory "
+						 "\"%s\" in NTFS volume",
+						 dentry_full_path(dentry));
+				return ret;
+			}
+		}
 	}
 	return 0;
 }
@@ -714,6 +763,7 @@ ntfs_3g_begin_extract_blob_instance(struct blob_descriptor *blob,
 				    struct ntfs_3g_apply_ctx *ctx)
 {
 	struct wim_dentry *one_dentry = inode_first_extraction_dentry(inode);
+	ntfschar *stream_name;
 	size_t stream_name_nchars;
 	ntfs_attr *attr;
 
@@ -736,22 +786,29 @@ ntfs_3g_begin_extract_blob_instance(struct blob_descriptor *blob,
 	/* It's a data stream (may be unnamed or named).  */
 	wimlib_assert(strm->stream_type == STREAM_TYPE_DATA);
 
-	stream_name_nchars = utf16le_len_chars(strm->stream_name);
+	if (unlikely(stream_is_named(strm))) {
+		stream_name = strm->stream_name;
+		stream_name_nchars = utf16le_len_chars(stream_name);
 
-	if (stream_name_nchars &&
-	    (ntfs_attr_add(ni, AT_DATA, strm->stream_name,
-			   stream_name_nchars, NULL, 0)))
-	{
-		ERROR_WITH_ERRNO("Failed to create named data stream of \"%s\"",
-				 dentry_full_path(one_dentry));
-		return WIMLIB_ERR_NTFS_3G;
+		if (ntfs_attr_add(ni, AT_DATA, stream_name,
+				  stream_name_nchars, NULL, 0))
+		{
+			ERROR_WITH_ERRNO("Failed to create named data stream of \"%s\"",
+					 dentry_full_path(one_dentry));
+			return WIMLIB_ERR_NTFS_3G;
+		}
+	} else {
+		/* Don't pass an empty string other than AT_UNNAMED to
+		 * ntfs_attr_open() --- it violates assumptions made by
+		 * libntfs-3g.  */
+		stream_name = AT_UNNAMED;
+		stream_name_nchars = 0;
 	}
 
 	/* This should be ensured by extract_blob_list()  */
 	wimlib_assert(ctx->num_open_attrs < MAX_OPEN_FILES);
 
-	attr = ntfs_attr_open(ni, AT_DATA, strm->stream_name,
-			      stream_name_nchars);
+	attr = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_nchars);
 	if (!attr) {
 		ERROR_WITH_ERRNO("Failed to open data stream of \"%s\"",
 				 dentry_full_path(one_dentry));
@@ -843,16 +900,35 @@ out:
 	return ret;
 }
 
+/* Note: contrary to its documentation, ntfs_attr_pwrite() can return a short
+ * count in non-error cases --- specifically, when writing to a compressed
+ * attribute and the requested count exceeds the size of an NTFS "compression
+ * block".  Therefore, we must continue calling ntfs_attr_pwrite() until all
+ * bytes have been written or a real error has occurred.  */
+static bool
+ntfs_3g_full_pwrite(ntfs_attr *na, u64 offset, size_t size, const u8 *data)
+{
+	while (size) {
+		s64 res = ntfs_attr_pwrite(na, offset, size, data);
+		if (unlikely(res <= 0))
+			return false;
+		wimlib_assert(res <= size);
+		offset += res;
+		size -= res;
+		data += res;
+	}
+	return true;
+}
+
 static int
 ntfs_3g_extract_chunk(const void *chunk, size_t size, void *_ctx)
 {
 	struct ntfs_3g_apply_ctx *ctx = _ctx;
-	s64 res;
 
 	for (unsigned i = 0; i < ctx->num_open_attrs; i++) {
-		res = ntfs_attr_pwrite(ctx->open_attrs[i],
-				       ctx->offset, size, chunk);
-		if (res != size) {
+		if (!ntfs_3g_full_pwrite(ctx->open_attrs[i],
+					 ctx->offset, size, chunk))
+		{
 			ERROR_WITH_ERRNO("Error writing data to NTFS volume");
 			return WIMLIB_ERR_NTFS_3G;
 		}