X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fresource.c;h=59c1d9c6cfe019b26db160e7ad57040ca5f8adcf;hb=bf9f9a8533a6f216068bdf61cafb1681ed1b7e1c;hp=dbdda6bc9c7109d3e209d5a280c29011f68e4841;hpb=d9d4b6b3e0462d3419bb8a9964b5da38a72da02f;p=wimlib

diff --git a/src/resource.c b/src/resource.c
index dbdda6bc..59c1d9c6 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -466,6 +466,7 @@ int read_wim_resource(const struct lookup_table_entry *lte, u8 buf[],
 			if (!fp) {
 				ERROR_WITH_ERRNO("Failed to open the file "
 						 "`%s'", lte->file_on_disk);
+				return WIMLIB_ERR_OPEN;
 			}
 		}
 		ret = read_uncompressed_resource(fp, offset, size, buf);
@@ -482,7 +483,13 @@ int read_wim_resource(const struct lookup_table_entry *lte, u8 buf[],
 		break;
 #ifdef WITH_NTFS_3G
 	case RESOURCE_IN_NTFS_VOLUME:
+		wimlib_assert(lte->ntfs_loc);
 		if (lte->attr) {
+			u64 adjusted_offset;
+			if (lte->ntfs_loc->is_reparse_point)
+				adjusted_offset = offset + 8;
+			else
+				adjusted_offset = offset;
 			if (ntfs_attr_pread(lte->attr, offset, size, buf) == size) {
 				return 0;
 			} else {
@@ -598,7 +605,6 @@ static int compress_chunk(const u8 chunk[], unsigned chunk_size,
 			  unsigned *compressed_chunk_len_ret,
 			  int ctype)
 {
-	unsigned compressed_chunk_sz;
 	int (*compress)(const void *, unsigned, void *, unsigned *);
 	switch (ctype) {
 	case WIM_COMPRESSION_TYPE_LZX:
@@ -643,7 +649,6 @@ static int write_wim_resource_chunk(const u8 chunk[], unsigned chunk_size,
 	} else {
 		u8 *compressed_chunk = alloca(chunk_size);
 		int ret;
-		unsigned compressed_chunk_len;
 
 		ret = compress_chunk(chunk, chunk_size, compressed_chunk,
 				     &out_chunk_size, out_ctype);
@@ -677,7 +682,7 @@ finish_wim_resource_chunk_tab(struct chunk_table *chunk_tab,
 {
 	size_t bytes_written;
 	if (fseeko(out_fp, chunk_tab->file_offset, SEEK_SET) != 0) {
-		ERROR_WITH_ERRNO("Failed to seek to byte "PRIu64" of output "
+		ERROR_WITH_ERRNO("Failed to seek to byte %"PRIu64" of output "
 				 "WIM file", chunk_tab->file_offset);
 		return WIMLIB_ERR_WRITE;
 	}
@@ -740,9 +745,11 @@ static int write_wim_resource(struct lookup_table_entry *lte,
 	bool raw;
 	off_t file_offset;
 #ifdef WITH_NTFS_3G
-	ntfs_inode *ni;
+	ntfs_inode *ni = NULL;
 #endif
 
+	wimlib_assert(lte);
+
 	/* Original size of the resource */
  	original_size = wim_resource_size(lte);
 
@@ -771,7 +778,7 @@ static int write_wim_resource(struct lookup_table_entry *lte,
 		return 0;
 
 	/* Buffer for reading chunks for the resource */
-	char buf[min(WIM_CHUNK_SIZE, bytes_remaining)];
+	u8 buf[min(WIM_CHUNK_SIZE, bytes_remaining)];
 
 	/* If we are writing a compressed resource and not doing a raw copy, we
 	 * need to initialize the chunk table */
@@ -799,7 +806,7 @@ static int write_wim_resource(struct lookup_table_entry *lte,
 	}
 #ifdef WITH_NTFS_3G
 	else if (lte->resource_location == RESOURCE_IN_NTFS_VOLUME
-		   && !lte->attr)
+		  && !lte->attr)
 	{
 		struct ntfs_location *loc = lte->ntfs_loc;
 		wimlib_assert(loc);
@@ -807,15 +814,18 @@ static int write_wim_resource(struct lookup_table_entry *lte,
 		if (!ni) {
 			ERROR_WITH_ERRNO("Failed to open inode `%s' in NTFS "
 					 "volume", loc->path_utf8);
+			ret = WIMLIB_ERR_NTFS_3G;
+			goto out;
 		}
 		lte->attr = ntfs_attr_open(ni,
 					   loc->is_reparse_point ? AT_REPARSE_POINT : AT_DATA,
 					   (ntfschar*)loc->stream_name_utf16,
 					   loc->stream_name_utf16_num_chars);
 		if (!lte->attr) {
-			ntfs_inode_close(ni);
 			ERROR_WITH_ERRNO("Failed to open attribute of `%s' in "
 					 "NTFS volume", loc->path_utf8);
+			ret = WIMLIB_ERR_NTFS_3G;
+			goto out_fclose;
 		}
 	}
 #endif
@@ -881,11 +891,13 @@ static int write_wim_resource(struct lookup_table_entry *lte,
 		}
 	}
 
-	if (new_compressed_size > original_size) {
+	if (new_compressed_size >= original_size &&
+	    out_ctype != WIM_COMPRESSION_TYPE_NONE && !raw)
+	{
 		/* Oops!  We compressed the resource to larger than the original
 		 * size.  Write the resource uncompressed instead. */
 		if (fseeko(out_fp, file_offset, SEEK_SET) != 0) {
-			ERROR_WITH_ERRNO("Failed to seek to byte "PRIu64" "
+			ERROR_WITH_ERRNO("Failed to seek to byte %"PRIu64" "
 					 "of output WIM file", file_offset);
 			ret = WIMLIB_ERR_WRITE;
 			goto out_fclose;
@@ -922,10 +934,13 @@ out_fclose:
 		lte->file_on_disk_fp = NULL;
 	}
 #ifdef WITH_NTFS_3G
-	else if (lte->resource_location == RESOURCE_IN_NTFS_VOLUME
-		 && lte->attr) {
-		ntfs_attr_close(lte->attr);
-		ntfs_inode_close(ni);
+	else if (lte->resource_location == RESOURCE_IN_NTFS_VOLUME) {
+		if (lte->attr) {
+			ntfs_attr_close(lte->attr);
+			lte->attr = NULL;
+		} if (ni) {
+			ntfs_inode_close(ni);
+		}
 	}
 #endif
 out:
@@ -952,7 +967,7 @@ static int write_wim_resource_from_buffer(const u8 *buf, u64 buf_size,
 	lte.resource_location            = RESOURCE_IN_ATTACHED_BUFFER;
 	lte.attached_buffer              = (u8*)buf;
 
-	zero_hash(lte.hash);
+	zero_out_hash(lte.hash);
 	ret = write_wim_resource(&lte, out_fp, out_ctype, out_res_entry);
 	if (ret != 0)
 		return ret;
@@ -970,7 +985,7 @@ int extract_wim_resource_to_fd(const struct lookup_table_entry *lte, int fd,
 			       u64 size)
 {
 	u64 bytes_remaining = size;
-	char buf[min(WIM_CHUNK_SIZE, bytes_remaining)];
+	u8 buf[min(WIM_CHUNK_SIZE, bytes_remaining)];
 	u64 offset = 0;
 	int ret = 0;
 	u8 hash[SHA1_HASH_SIZE];
@@ -1093,14 +1108,12 @@ int write_dentry_resources(struct dentry *dentry, void *wim_p)
  *
  * @return:	Zero on success, nonzero on failure.
  */
-int read_metadata_resource(FILE *fp, int wim_ctype, struct image_metadata *imd)
+int read_metadata_resource(WIMStruct *w, struct image_metadata *imd)
 {
 	u8 *buf;
-	int ctype;
 	u32 dentry_offset;
 	int ret;
 	struct dentry *dentry;
-	struct wim_security_data *sd;
 	struct link_group_table *lgt;
 	const struct lookup_table_entry *metadata_lte;
 	u64 metadata_len;
@@ -1118,7 +1131,7 @@ int read_metadata_resource(FILE *fp, int wim_ctype, struct image_metadata *imd)
 	 * no security descriptors) and WIM_DENTRY_DISK_SIZE is for the root
 	 * dentry. */
 	if (metadata_len < 8 + WIM_DENTRY_DISK_SIZE) {
-		ERROR("Expected at least %zu bytes for the metadata resource",
+		ERROR("Expected at least %u bytes for the metadata resource",
 		      8 + WIM_DENTRY_DISK_SIZE);
 		return WIMLIB_ERR_INVALID_RESOURCE_SIZE;
 	}
@@ -1150,7 +1163,7 @@ int read_metadata_resource(FILE *fp, int wim_ctype, struct image_metadata *imd)
 	 * and if successful, go ahead and calculate the offset in the metadata
 	 * resource of the root dentry. */
 
-	ret = read_security_data(buf, metadata_len, &sd);
+	ret = read_security_data(buf, metadata_len, &imd->security_data);
 	if (ret != 0)
 		goto out_free_buf;
 
@@ -1198,14 +1211,19 @@ int read_metadata_resource(FILE *fp, int wim_ctype, struct image_metadata *imd)
 	if (ret != 0)
 		goto out_free_lgt;
 
-	DEBUG("Freeing duplicate ADS entries in link group table");
-	ret = link_groups_free_duplicate_data(lgt);
+	DEBUG("Fixing inconsistencies in the link groups");
+	ret = fix_link_groups(lgt);
 	if (ret != 0)
 		goto out_free_lgt;
+
+	DEBUG("Running miscellaneous verifications on the dentry tree");
+	ret = for_dentry_in_tree(dentry, verify_dentry, w);
+	if (ret != 0)
+		goto out_free_lgt;
+
 	DEBUG("Done reading image metadata");
 
 	imd->lgt           = lgt;
-	imd->security_data = sd;
 	imd->root_dentry   = dentry;
 	goto out_free_buf;
 out_free_lgt:
@@ -1213,7 +1231,8 @@ out_free_lgt:
 out_free_dentry_tree:
 	free_dentry_tree(dentry, NULL);
 out_free_security_data:
-	free_security_data(sd);
+	free_security_data(imd->security_data);
+	imd->security_data = NULL;
 out_free_buf:
 	FREE(buf);
 	return ret;
@@ -1227,7 +1246,7 @@ int write_metadata_resource(WIMStruct *w)
 	int ret;
 	u64 subdir_offset;
 	struct dentry *root;
-	struct lookup_table_entry *lte, *duplicate_lte;
+	struct lookup_table_entry *lte;
 	u64 metadata_original_size;
 	const struct wim_security_data *sd;
 	const unsigned random_tail_len = 20;
@@ -1248,7 +1267,8 @@ int write_metadata_resource(WIMStruct *w)
 	 * - plus 8 bytes for an end-of-directory entry following the root
 	 *   dentry (shouldn't really be needed, but just in case...)
 	 */
-	subdir_offset = ((sd->total_length + 7) & ~7) + dentry_total_length(root) + 8;
+	subdir_offset = ((sd->total_length + 7) & ~7) +
+			dentry_correct_total_length(root) + 8;
 
 	/* Calculate the subdirectory offsets for the entire dentry tree. */
 	calculate_subdir_offsets(root, &subdir_offset);