X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-apply.c;h=35760400bc9530463e0227589071a6667eeb6a66;hb=bc0480e80627467ff64818235fbd164ed179f64c;hp=245e0b55c3a1feb1d807e5979d556cd9401cb42c;hpb=650997e4865a090b6856c7ca34b02f42994e8e29;p=wimlib

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 245e0b55..35760400 100644
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -43,11 +43,17 @@
 #include <string.h>
 #include <locale.h>
 
-static int extract_wim_chunk_to_ntfs_attr(const void *buf, size_t len,
-					  u64 offset, void *arg)
+struct ntfs_attr_extract_ctx {
+	u64 offset;
+	ntfs_attr *na;
+};
+
+static int
+extract_wim_chunk_to_ntfs_attr(const void *buf, size_t len, void *_ctx)
 {
-	ntfs_attr *na = arg;
-	if (ntfs_attr_pwrite(na, offset, len, buf) == len) {
+	struct ntfs_attr_extract_ctx *ctx = _ctx;
+	if (ntfs_attr_pwrite(ctx->na, ctx->offset, len, buf) == len) {
+		ctx->offset += len;
 		return 0;
 	} else {
 		ERROR_WITH_ERRNO("Error extracting WIM resource to NTFS attribute");
@@ -62,8 +68,11 @@ static int
 extract_wim_resource_to_ntfs_attr(const struct wim_lookup_table_entry *lte,
 			          ntfs_attr *na)
 {
+	struct ntfs_attr_extract_ctx ctx;
+	ctx.na = na;
+	ctx.offset = 0;
 	return extract_wim_resource(lte, wim_resource_size(lte),
-				    extract_wim_chunk_to_ntfs_attr, na);
+				    extract_wim_chunk_to_ntfs_attr, &ctx);
 }
 
 /* Writes the data streams of a WIM inode to the data attributes of a NTFS
@@ -82,8 +91,9 @@ extract_wim_resource_to_ntfs_attr(const struct wim_lookup_table_entry *lte,
  *
  * Returns 0 on success, nonzero on failure.
  */
-static int write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dentry,
-				   union wimlib_progress_info *progress_info)
+static int
+write_ntfs_data_streams(ntfs_inode *ni, struct wim_dentry *dentry,
+			union wimlib_progress_info *progress_info)
 {
 	int ret = 0;
 	unsigned stream_idx = 0;
@@ -92,13 +102,19 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dent
 	const struct wim_inode *inode = dentry->d_inode;
 	struct wim_lookup_table_entry *lte;
 
+	lte = inode->i_lte;
+
+	/* For directories, skip unnamed streams; just extract alternate data
+	 * streams. */
+	if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY)
+		goto cont;
+
 	DEBUG("Writing %u NTFS data stream%s for `%s'",
 	      inode->i_num_ads + 1,
 	      (inode->i_num_ads == 0 ? "" : "s"),
-	      dentry->full_path);
+	      dentry->_full_path);
 
-	lte = inode->i_lte;
-	while (1) {
+	for (;;) {
 		if (stream_name_nbytes) {
 			/* Skip special UNIX data entries (see documentation for
 			 * WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) */
@@ -111,11 +127,11 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dent
 			/* Create an empty named stream. */
 			ret = ntfs_attr_add(ni, AT_DATA, stream_name,
 					    stream_name_nbytes / 2, NULL, 0);
-			if (ret != 0) {
+			if (ret) {
 				ERROR_WITH_ERRNO("Failed to create named data "
 						 "stream for extracted file "
 						 "`%s'",
-						 dentry->full_path);
+						 dentry->_full_path);
 				ret = WIMLIB_ERR_NTFS_3G;
 				break;
 
@@ -132,7 +148,7 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dent
 			if (!na) {
 				ERROR_WITH_ERRNO("Failed to open a data stream of "
 						 "extracted file `%s'",
-						 dentry->full_path);
+						 dentry->_full_path);
 				ret = WIMLIB_ERR_NTFS_3G;
 				break;
 			}
@@ -141,7 +157,7 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dent
 			 * length, so the NTFS attribute should be resized to
 			 * this length before starting to extract the data. */
 			ret = ntfs_attr_truncate_solid(na, wim_resource_size(lte));
-			if (ret != 0) {
+			if (ret) {
 				ntfs_attr_close(na);
 				break;
 			}
@@ -151,7 +167,7 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dent
 
 			/* Close the attribute */
 			ntfs_attr_close(na);
-			if (ret != 0)
+			if (ret)
 				break;
 
 			/* Record the number of bytes of uncompressed data that
@@ -174,21 +190,21 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dent
 /* Open the NTFS inode that corresponds to the parent of a WIM dentry.  Returns
  * the opened inode, or NULL on failure. */
 static ntfs_inode *
-dentry_open_parent_ni(const struct wim_dentry *dentry, ntfs_volume *vol)
+dentry_open_parent_ni(struct wim_dentry *dentry, ntfs_volume *vol)
 {
 	char *p;
 	const char *dir_name;
 	ntfs_inode *dir_ni;
 	char orig;
 
-	p = dentry->full_path + dentry->full_path_nbytes;
+	p = dentry->_full_path + dentry->full_path_nbytes;
 	do {
 		p--;
 	} while (*p != '/');
 
 	orig = *p;
 	*p = '\0';
-	dir_name = dentry->full_path;
+	dir_name = dentry->_full_path;
 	dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name);
 	if (!dir_ni) {
 		ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
@@ -214,7 +230,7 @@ dentry_open_parent_ni(const struct wim_dentry *dentry, ntfs_volume *vol)
  * Return 0 on success, nonzero on failure.  dir_ni is closed either way.
  */
 static int
-apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
+apply_ntfs_hardlink(struct wim_dentry *from_dentry,
 		    const struct wim_inode *inode,
 		    ntfs_inode *dir_ni)
 {
@@ -230,7 +246,7 @@ apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
 	}
 
 	DEBUG("Extracting NTFS hard link `%s' => `%s'",
-	      from_dentry->full_path, inode->i_extracted_file);
+	      from_dentry->_full_path, inode->i_extracted_file);
 
 	to_ni = ntfs_pathname_to_inode(vol, NULL, inode->i_extracted_file);
 	if (!to_ni) {
@@ -252,7 +268,7 @@ apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
 	ret |= ntfs_inode_close(to_ni);
 	if (ret) {
 		ERROR_WITH_ERRNO("Could not create hard link `%s' => `%s'",
-				 from_dentry->full_path,
+				 from_dentry->_full_path,
 				 inode->i_extracted_file);
 		ret = WIMLIB_ERR_NTFS_3G;
 	}
@@ -273,7 +289,7 @@ apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
 static int
 apply_file_attributes_and_security_data(ntfs_inode *ni,
 					ntfs_inode *dir_ni,
-					const struct wim_dentry *dentry,
+					struct wim_dentry *dentry,
 					const WIMStruct *w,
 					int extract_flags)
 {
@@ -285,7 +301,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
 	inode = dentry->d_inode;
 
 	DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
-	      dentry->full_path, inode->i_attributes);
+	      dentry->_full_path, inode->i_attributes);
 
 	attributes_le32 = cpu_to_le32(inode->i_attributes);
 	memset(&ctx, 0, sizeof(ctx));
@@ -294,13 +310,12 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
 					 ni, dir_ni,
 					 (const char*)&attributes_le32,
 					 sizeof(u32), 0);
-	if (ret != 0) {
+	if (ret) {
 		ERROR("Failed to set NTFS file attributes on `%s'",
-		       dentry->full_path);
-		return WIMLIB_ERR_NTFS_3G;
-	}
-	if (inode->i_security_id != -1 &&
-	    !(extract_flags & WIMLIB_EXTRACT_FLAG_NOACLS))
+		      dentry->_full_path);
+		ret = WIMLIB_ERR_NTFS_3G;
+	} else if (inode->i_security_id != -1 &&
+		   !(extract_flags & WIMLIB_EXTRACT_FLAG_NO_ACLS))
 	{
 		const char *desc;
 		const struct wim_security_data *sd;
@@ -309,44 +324,47 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
 		wimlib_assert(inode->i_security_id < sd->num_entries);
 		desc = (const char *)sd->descriptors[inode->i_security_id];
 		DEBUG("Applying security descriptor %d to `%s'",
-		      inode->i_security_id, dentry->full_path);
+		      inode->i_security_id, dentry->_full_path);
 
 		ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
 						 ni, dir_ni, desc,
 						 sd->sizes[inode->i_security_id], 0);
 
-		if (ret != 0) {
+		if (ret) {
 			ERROR_WITH_ERRNO("Failed to set security data on `%s'",
-					dentry->full_path);
-			return WIMLIB_ERR_NTFS_3G;
+					dentry->_full_path);
+			ret = WIMLIB_ERR_NTFS_3G;
 		}
 	}
-	return 0;
+	return ret;
 }
 
 /*
  * Transfers the reparse data from a WIM inode (which must represent a reparse
  * point) to a NTFS inode.
  */
-static int apply_reparse_data(ntfs_inode *ni, const struct wim_dentry *dentry,
-			      union wimlib_progress_info *progress_info)
+static int
+apply_reparse_data(ntfs_inode *ni, struct wim_dentry *dentry,
+		   union wimlib_progress_info *progress_info)
 {
 	struct wim_lookup_table_entry *lte;
-	int ret = 0;
+	int ret;
 
 	lte = inode_unnamed_lte_resolved(dentry->d_inode);
 
-	DEBUG("Applying reparse data to `%s'", dentry->full_path);
+	DEBUG("Applying reparse data to `%s'", dentry->_full_path);
 
 	if (!lte) {
 		ERROR("Could not find reparse data for `%s'",
-		      dentry->full_path);
+		      dentry->_full_path);
 		return WIMLIB_ERR_INVALID_DENTRY;
 	}
 
-	if (wim_resource_size(lte) >= 0xffff) {
+	/* "Reparse point data, including the tag and optional GUID, cannot
+	 * exceed 16 kilobytes." - MSDN  */
+	if (wim_resource_size(lte) > REPARSE_POINT_MAX_SIZE - 8) {
 		ERROR("Reparse data of `%s' is too long (%"PRIu64" bytes)",
-		      dentry->full_path, wim_resource_size(lte));
+		      dentry->_full_path, wim_resource_size(lte));
 		return WIMLIB_ERR_INVALID_DENTRY;
 	}
 
@@ -357,19 +375,20 @@ static int apply_reparse_data(ntfs_inode *ni, const struct wim_dentry *dentry,
 	p = put_u16(p, wim_resource_size(lte)); /* ReparseDataLength */
 	p = put_u16(p, 0); /* Reserved */
 
-	ret = read_full_wim_resource(lte, p, 0);
-	if (ret != 0)
+	ret = read_full_resource_into_buf(lte, p);
+	if (ret)
 		return ret;
 
 	ret = ntfs_set_ntfs_reparse_data(ni, (char*)reparse_data_buf,
 					 wim_resource_size(lte) + 8, 0);
-	if (ret != 0) {
+	if (ret) {
 		ERROR_WITH_ERRNO("Failed to set NTFS reparse data on `%s'",
-				 dentry->full_path);
+				 dentry->_full_path);
 		return WIMLIB_ERR_NTFS_3G;
+	} else {
+		progress_info->extract.completed_bytes += wim_resource_size(lte);
 	}
-	progress_info->extract.completed_bytes += wim_resource_size(lte);
-	return 0;
+	return ret;
 }
 
 /*
@@ -384,7 +403,7 @@ static int
 do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni,
 		     struct apply_args *args)
 {
-	int ret = 0;
+	int ret;
 	mode_t type;
 	ntfs_inode *ni = NULL;
 	struct wim_inode *inode = dentry->d_inode;
@@ -408,8 +427,8 @@ do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni,
 				 * extracted yet, so go ahead and extract the
 				 * first one. */
 				FREE(inode->i_extracted_file);
-				inode->i_extracted_file = STRDUP(dentry->full_path);
-				if (!inode->i_extracted_file) {
+				if (!(inode->i_extracted_file = STRDUP(dentry->_full_path)))
+				{
 					ret = WIMLIB_ERR_NOMEM;
 					goto out_close_dir_ni;
 				}
@@ -427,29 +446,27 @@ do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni,
 
 	if (!ni) {
 		ERROR_WITH_ERRNO("Could not create NTFS inode for `%s'",
-				 dentry->full_path);
+				 dentry->_full_path);
 		ret = WIMLIB_ERR_NTFS_3G;
 		goto out_close_dir_ni;
 	}
 
-	/* Write the data streams, unless this is a directory or reparse point
-	 * */
-	if (!(inode->i_attributes & (FILE_ATTRIBUTE_REPARSE_POINT |
-				   FILE_ATTRIBUTE_DIRECTORY))) {
+	/* Write the data streams, unless this is reparse point. */
+	if (!(inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
 		ret = write_ntfs_data_streams(ni, dentry, &args->progress);
-		if (ret != 0)
+		if (ret)
 			goto out_close_dir_ni;
 	}
 
 	ret = apply_file_attributes_and_security_data(ni, dir_ni, dentry,
 						      args->w,
 						      args->extract_flags);
-	if (ret != 0)
+	if (ret)
 		goto out_close_dir_ni;
 
 	if (inode->i_attributes & FILE_ATTR_REPARSE_POINT) {
 		ret = apply_reparse_data(ni, dentry, &args->progress);
-		if (ret != 0)
+		if (ret)
 			goto out_close_dir_ni;
 	}
 
@@ -461,18 +478,18 @@ do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni,
 				      dentry->short_name_nbytes,
 				      &short_name_mbs,
 				      &short_name_mbs_nbytes);
-		if (ret != 0)
+		if (ret)
 			goto out_close_dir_ni;
 
 		DEBUG("Setting short (DOS) name of `%s' to %s",
-		      dentry->full_path, short_name_mbs);
+		      dentry->_full_path, short_name_mbs);
 
 		ret = ntfs_set_ntfs_dos_name(ni, dir_ni, short_name_mbs,
 					     short_name_mbs_nbytes, 0);
 		FREE(short_name_mbs);
-		if (ret != 0) {
+		if (ret) {
 			ERROR_WITH_ERRNO("Could not set DOS (short) name for `%s'",
-					 dentry->full_path);
+					 dentry->_full_path);
 			ret = WIMLIB_ERR_NTFS_3G;
 		}
 		/* inodes have been closed by ntfs_set_ntfs_dos_name(). */
@@ -485,14 +502,15 @@ out_close_dir_ni:
 				if (ret == 0)
 					ret = WIMLIB_ERR_NTFS_3G;
 				ERROR_WITH_ERRNO("Failed to close inode for `%s'",
-						 dentry->full_path);
+						 dentry->_full_path);
 			}
 		}
 		if (ntfs_inode_close(dir_ni)) {
 			if (ret == 0)
 				ret = WIMLIB_ERR_NTFS_3G;
 			ERROR_WITH_ERRNO("Failed to close inode of directory "
-					 "containing `%s'", dentry->full_path);
+					 "containing `%s'",
+					 dentry->_full_path);
 		}
 	}
 out:
@@ -500,7 +518,7 @@ out:
 }
 
 static int
-apply_root_dentry_ntfs(const struct wim_dentry *dentry,
+apply_root_dentry_ntfs(struct wim_dentry *dentry,
 		       ntfs_volume *vol, const WIMStruct *w,
 		       int extract_flags)
 {
@@ -624,12 +642,12 @@ apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg)
 	ntfs_inode *ni;
 	int ret;
 
-	DEBUG("Setting timestamps on `%s'", dentry->full_path);
+	DEBUG("Setting timestamps on `%s'", dentry->_full_path);
 
-	ni = ntfs_pathname_to_inode(vol, NULL, dentry->full_path);
+	ni = ntfs_pathname_to_inode(vol, NULL, dentry->_full_path);
 	if (!ni) {
 		ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
-				 dentry->full_path);
+				 dentry->_full_path);
 		return WIMLIB_ERR_NTFS_3G;
 	}
 
@@ -640,7 +658,7 @@ apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg)
 	ret = ntfs_inode_set_times(ni, (const char*)buf, 3 * sizeof(u64), 0);
 	if (ret != 0) {
 		ERROR_WITH_ERRNO("Failed to set NTFS timestamps on `%s'",
-				 dentry->full_path);
+				 dentry->_full_path);
 		ret = WIMLIB_ERR_NTFS_3G;
 	}
 
@@ -648,7 +666,7 @@ apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg)
 		if (ret == 0)
 			ret = WIMLIB_ERR_NTFS_3G;
 		ERROR_WITH_ERRNO("Failed to close NTFS inode for `%s'",
-				 dentry->full_path);
+				 dentry->_full_path);
 	}
 	return ret;
 }