split, join: Read input WIM(s) sequentially

[wimlib] / src / join.c

diff --git a/src/join.c b/src/join.c
index 205c68d1354232be9e857b8615863a7e8ee4b339..e566ba2861a74aeb9f06b55009be14cad6fff5c8 100644 (file)
--- 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,25 +116,28 @@ 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 = fopen(swms[i]->filename, "rb");
+               swms[i]->fp = tfopen(swms[i]->filename, T("rb"));
                if (!swms[i]->fp) {
-                       ERROR_WITH_ERRNO("Failed to reopen `%s'",
+                       ERROR_WITH_ERRNO("Failed to reopen `%"TS"'",
                                         swms[i]->filename);
                        return WIMLIB_ERR_OPEN;
                }
                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;
 }
 
@@ -165,8 +182,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)
 {