X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=b5c7c37bb576c202ae108227f80441640fa4599a;hb=e94aa48490fda7524b49478e5aa2dc4b7d03b0a1;hp=0f47f0b74cb6e91c237b9e6fe5b9bc6f587eade0;hpb=fe6c34ebb7d5adeeceeed22142e080965d85a1eb;p=wimlib

diff --git a/src/join.c b/src/join.c
index 0f47f0b7..b5c7c37b 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;
 }
 
 /*
@@ -107,10 +109,10 @@ join_wims(WIMStruct **swms, unsigned num_swms,
 	}
 
 	if (progress_func) {
-		progress.join.total_bytes        = total_bytes;
-		progress.join.total_parts        = swms[0]->hdr.total_parts;
-		progress.join.completed_bytes    = 0;
-		progress.join.completed_parts    = 0;
+		progress.join.total_bytes     = total_bytes;
+		progress.join.total_parts     = swms[0]->hdr.total_parts;
+		progress.join.completed_bytes = 0;
+		progress.join.completed_parts = 0;
 		progress_func(WIMLIB_PROGRESS_MSG_JOIN_STREAMS, &progress);
 	}
 
@@ -124,8 +126,10 @@ 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;
 
 		if (i != 0) {
@@ -146,14 +150,13 @@ 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,
+		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);
 
@@ -201,8 +204,8 @@ wimlib_join(const tchar * const *swm_names,
 	for (i = 0; i < num_swms; i++) {
 		ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swms[i],
 				      progress_func);
-		if (ret != 0)
-			goto out;
+		if (ret)
+			goto out_free_wims;
 
 		/* Don't open all the parts at the same time, in case there are
 		 * a lot of them */
@@ -213,20 +216,20 @@ wimlib_join(const tchar * const *swm_names,
 	qsort(swms, num_swms, sizeof(swms[0]), cmp_swms_by_part_number);
 
 	ret = verify_swm_set(swms[0], &swms[1], num_swms - 1);
-	if (ret != 0)
-		goto out;
+	if (ret)
+		goto out_free_wims;
 
 	ret = wimlib_create_new_wim(wimlib_get_compression_type(swms[0]),
 				    &joined_wim);
-	if (ret != 0)
-		goto out;
+	if (ret)
+		goto out_free_wims;
 
 	ret = begin_write(joined_wim, output_path, wim_write_flags);
-	if (ret != 0)
-		goto out;
+	if (ret)
+		goto out_free_wims;
 	ret = join_wims(swms, num_swms, joined_wim, wim_write_flags,
 			progress_func);
-out:
+out_free_wims:
 	for (i = 0; i < num_swms; i++)
 		wimlib_free(swms[i]);
 	wimlib_free(joined_wim);