X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fextract.c;h=ac50fa8fb87c27e5e8a19eb6c8920515b185d22d;hb=3872f9e0d30f6439b2a08e091fbd3df042841b6a;hp=0029aa88016097b161ac515f61ffbbacf3c27cff;hpb=28d78c881095a7b50be60ed8d506aa15cceb9cae;p=wimlib

diff --git a/src/extract.c b/src/extract.c
index 0029aa88..ac50fa8f 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -8,20 +8,18 @@
 /*
  * Copyright (C) 2012, 2013, 2014 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file 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 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * 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 General Public License for more
+ * This file 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 /*
@@ -42,6 +40,7 @@
 #endif
 
 #include "wimlib/apply.h"
+#include "wimlib/assert.h"
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
 #include "wimlib/endianness.h"
@@ -739,6 +738,7 @@ destroy_dentry_list(struct list_head *dentry_list)
 		inode = dentry->d_inode;
 		dentry_reset_extraction_list_node(dentry);
 		inode->i_visited = 0;
+		inode->i_can_externally_back = 0;
 		if ((void *)dentry->d_extraction_name != (void *)dentry->file_name)
 			FREE(dentry->d_extraction_name);
 		dentry->d_extraction_name = NULL;
@@ -1009,7 +1009,7 @@ dentry_list_resolve_streams(struct list_head *dentry_list,
 }
 
 static int
-ref_stream(struct wim_lookup_table_entry *lte, u32 stream_idx,
+ref_stream(struct wim_lookup_table_entry *lte, unsigned stream_idx,
 	   struct wim_dentry *dentry, struct apply_ctx *ctx)
 {
 	struct wim_inode *inode = dentry->d_inode;
@@ -1084,7 +1084,7 @@ ref_unnamed_stream(struct wim_dentry *dentry, struct apply_ctx *ctx)
 {
 	struct wim_inode *inode = dentry->d_inode;
 	int ret;
-	u16 stream_idx;
+	unsigned stream_idx;
 	struct wim_lookup_table_entry *stream;
 
 	if (unlikely(inode_is_encrypted_directory(inode)))
@@ -1121,8 +1121,8 @@ dentry_ref_streams(struct wim_dentry *dentry, struct apply_ctx *ctx)
 	 * extraction mode and volume, and to avoid complications, if not doing
 	 * a linked extraction.  */
 	if (ctx->supported_features.named_data_streams) {
-		for (u16 i = 0; i < inode->i_num_ads; i++) {
-			if (!ads_entry_is_named_stream(&inode->i_ads_entries[i]))
+		for (unsigned i = 0; i < inode->i_num_ads; i++) {
+			if (!inode->i_ads_entries[i].stream_name_nbytes)
 				continue;
 			ret = ref_stream(inode->i_ads_entries[i].lte, i + 1,
 					 dentry, ctx);
@@ -1478,12 +1478,12 @@ extract_trees(WIMStruct *wim, struct wim_dentry **trees, size_t num_trees,
 	if (ret)
 		goto out_cleanup;
 
+	dentry_list_build_inode_alias_lists(&dentry_list);
+
 	ret = dentry_list_ref_streams(&dentry_list, ctx);
 	if (ret)
 		goto out_cleanup;
 
-	dentry_list_build_inode_alias_lists(&dentry_list);
-
 	if (extract_flags & WIMLIB_EXTRACT_FLAG_FROM_PIPE) {
 		/* When extracting from a pipe, the number of bytes of data to
 		 * extract can't be determined in the normal way (examining the
@@ -2018,7 +2018,7 @@ wimlib_extract_image_from_pipe_with_progress(int pipe_fd,
 		if (i == image) {
 			/* Metadata resource is for the image being extracted.
 			 * Parse it and save the metadata in memory.  */
-			ret = read_metadata_resource(pwm, imd);
+			ret = read_metadata_resource(imd);
 			if (ret)
 				goto out_wimlib_free;
 			imd->modified = 1;