X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fjoin.c;h=e566ba2861a74aeb9f06b55009be14cad6fff5c8;hp=2902a61cae68c86acc5fb134f327a982b2cb3403;hb=a8972bde4b080d2dd33a7500705d431b0f1fe901;hpb=276f9f9f9658f4a8bafd6216db46760abe8c848d

diff --git a/src/join.c b/src/join.c
index 2902a61c..e566ba28 100644
--- a/src/join.c
+++ b/src/join.c
@@ -40,7 +40,9 @@ static int
 lookup_table_join(struct wim_lookup_table *table,
 		  struct wim_lookup_table *new)
 {
-	return for_lookup_table_entry(new, move_lte_to_table, table);
+	for_lookup_table_entry(new, move_lte_to_table, table);
+	new->num_entries = 0;
+	return 0;
 }
 
 /*
@@ -114,9 +116,7 @@ join_wims(WIMStruct **swms, unsigned num_swms,
 		progress_func(WIMLIB_PROGRESS_MSG_JOIN_STREAMS, &progress);
 	}
 
-	/* Write the resources (streams and metadata resources) from each SWM
-	 * part */
-	swms[0]->write_metadata = true;
+	/* Write the non-metadata resources from each SWM part */
 	for (i = 0; i < num_swms; i++) {
 		swms[i]->fp = tfopen(swms[i]->filename, T("rb"));
 		if (!swms[i]->fp) {
@@ -126,13 +126,18 @@ join_wims(WIMStruct **swms, unsigned num_swms,
 		}
 		swms[i]->out_fp = joined_wim->out_fp;
 		swms[i]->hdr.part_number = 1;
-		ret = for_lookup_table_entry(swms[i]->lookup_table,
-					     copy_resource, swms[i]);
+
+		ret = for_lookup_table_entry_pos_sorted(swms[i]->lookup_table,
+							copy_resource,
+							swms[i]);
 		swms[i]->out_fp = NULL;
-		fclose(swms[i]->fp);
-		swms[i]->fp = NULL;
 
-		if (ret != 0)
+		if (i != 0) {
+			fclose(swms[i]->fp);
+			swms[i]->fp = NULL;
+		}
+
+		if (ret)
 			return ret;
 
 		if (progress_func) {
@@ -142,14 +147,26 @@ join_wims(WIMStruct **swms, unsigned num_swms,
 		}
 	}
 
+	/* Copy the metadata resources from the first SWM part */
+	joined_wim->hdr.image_count = swms[0]->hdr.image_count;
+	for (i = 0; i < joined_wim->hdr.image_count; i++) {
+		ret = copy_resource(swms[0]->image_metadata[i].metadata_lte,
+				    joined_wim);
+		if (ret)
+			return ret;
+	}
+
+	/* Write lookup table, XML data, and optional integrity table */
 	joined_wim->hdr.image_count = swms[0]->hdr.image_count;
 	for (i = 0; i < num_swms; i++)
 		lookup_table_join(joined_wim->lookup_table, swms[i]->lookup_table);
 
 	free_wim_info(joined_wim->wim_info);
 	joined_wim->wim_info = swms[0]->wim_info;
+	joined_wim->image_metadata = swms[0]->image_metadata;
 	ret = finish_write(joined_wim, WIMLIB_ALL_IMAGES, write_flags, progress_func);
 	joined_wim->wim_info = NULL;
+	joined_wim->image_metadata = NULL;
 	return ret;
 }