X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=b6bf6ebd78d22d598d3e6e536cab2dbe706f7386;hb=4f8059f2d0a74a9922128b162d9c9343b305999c;hp=205c68d1354232be9e857b8615863a7e8ee4b339;hpb=541b65d79e0c73238a25e2c2661711d8593d0684;p=wimlib

diff --git a/src/join.c b/src/join.c
index 205c68d1..b6bf6ebd 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,32 +109,29 @@ 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);
 	}
 
-	/* 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 = fopen(swms[i]->filename, "rb");
-		if (!swms[i]->fp) {
-			ERROR_WITH_ERRNO("Failed to reopen `%s'",
-					 swms[i]->filename);
-			return WIMLIB_ERR_OPEN;
-		}
-		swms[i]->out_fp = joined_wim->out_fp;
+		ret = reopen_wim(swms[i]);
+		if (ret)
+			return ret;
+		swms[i]->out_fd = joined_wim->out_fd;
 		swms[i]->hdr.part_number = 1;
-		ret = for_lookup_table_entry(swms[i]->lookup_table,
-					     copy_resource, swms[i]);
-		swms[i]->out_fp = NULL;
-		fclose(swms[i]->fp);
-		swms[i]->fp = NULL;
 
-		if (ret != 0)
+		ret = for_lookup_table_entry_pos_sorted(swms[i]->lookup_table,
+							copy_resource,
+							swms[i]);
+		swms[i]->out_fd = -1;
+		if (i != 0)
+			close_wim(swms[i]);
+
+		if (ret)
 			return ret;
 
 		if (progress_func) {
@@ -142,14 +141,25 @@ 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 */
 	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;
 }
 
@@ -165,8 +175,10 @@ cmp_swms_by_part_number(const void *swm1, const void *swm2)
  * Join a set of split WIMs into a stand-alone WIM.
  */
 WIMLIBAPI int
-wimlib_join(const mbchar * const *swm_names, unsigned num_swms,
-	    const mbchar *output_path, int swm_open_flags,
+wimlib_join(const tchar * const *swm_names,
+	    unsigned num_swms,
+	    const tchar *output_path,
+	    int swm_open_flags,
 	    int wim_write_flags,
 	    wimlib_progress_func_t progress_func)
 {
@@ -186,32 +198,31 @@ wimlib_join(const mbchar * const *swm_names, unsigned num_swms,
 	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 */
-		fclose(swms[i]->fp);
-		swms[i]->fp = NULL;
+		close_wim(swms[i]);
 	}
 
 	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);