X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fresource.c;h=dee8bd1554d26864f57777360b3466bf9af4a843;hb=2441b3b94cf77a5193550682695dfaf930466764;hp=0c7a4cf9b40f3a929ec459188e7239fc96051604;hpb=c6127ff151b2963c5b90e4018f08f53051a97dfd;p=wimlib

diff --git a/src/resource.c b/src/resource.c
index 0c7a4cf9..dee8bd15 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -5,23 +5,21 @@
  */
 
 /*
- * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
  * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
  *
  * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU General Public License along with
+ * wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
 #include "wimlib_internal.h"
@@ -483,7 +481,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 {
@@ -599,7 +603,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:
@@ -644,7 +647,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);
@@ -678,7 +680,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;
 	}
@@ -741,9 +743,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);
 
@@ -772,7 +776,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 */
@@ -800,7 +804,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);
@@ -808,15 +812,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
@@ -888,7 +895,7 @@ static int write_wim_resource(struct lookup_table_entry *lte,
 		/* 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;
@@ -925,10 +932,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:
@@ -955,7 +965,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;
@@ -973,7 +983,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];
@@ -1099,7 +1109,6 @@ int write_dentry_resources(struct dentry *dentry, void *wim_p)
 int read_metadata_resource(WIMStruct *w, struct image_metadata *imd)
 {
 	u8 *buf;
-	int ctype;
 	u32 dentry_offset;
 	int ret;
 	struct dentry *dentry;
@@ -1120,7 +1129,7 @@ int read_metadata_resource(WIMStruct *w, 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;
 	}
@@ -1200,8 +1209,8 @@ int read_metadata_resource(WIMStruct *w, 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;
 
@@ -1235,7 +1244,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;
@@ -1256,7 +1265,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);