Win32: Fix, comment capture reparse-point fixups

[wimlib] / src / join.c

diff --git a/src/join.c b/src/join.c
index 7d33eb895e54b7ee0945cf569f19ed7d6fd41ec0..b5c7c37bb576c202ae108227f80441640fa4599a 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;
 }
 
 /*
@@ -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) {
@@ -133,7 +137,7 @@ join_wims(WIMStruct **swms, unsigned num_swms,
                        swms[i]->fp = NULL;
                }
 
-               if (ret != 0)
+               if (ret)
                        return ret;
 
                if (progress_func) {
@@ -143,18 +147,16 @@ join_wims(WIMStruct **swms, unsigned num_swms,
                }
        }
 
-       /* Write metadata resources from the first SWM part */
-       swms[0]->out_fp = joined_wim->out_fp;
-       ret = for_image(swms[0], WIMLIB_ALL_IMAGES, write_metadata_resource);
-       swms[0]->out_fp = NULL;
-       fclose(swms[0]->fp);
-       swms[0]->fp = NULL;
-
-       if (ret)
-               return ret;
+       /* 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);
 
@@ -202,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 */
@@ -214,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);