Merge branch with pipable WIM support

[wimlib] / src / join.c

diff --git a/src/join.c b/src/join.c
index a3eb07b557db4ad9a05f264b57dc2265b11b1e6e..5cda7739a1f57d2f5a0820b837b01c65a3c5f439 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -28,102 +28,11 @@
 #endif
 
 #include "wimlib.h"
 #endif
 
 #include "wimlib.h"

-#include "wimlib/lookup_table.h"
-#include "wimlib/metadata.h"
-#include "wimlib/resource.h"
-#include "wimlib/swm.h"
-#include "wimlib/write.h"
-#include "wimlib/xml.h"
+#include "wimlib/types.h"
+#include "wimlib/util.h"
+#include "wimlib/wim.h"

 
 

-#include <stdlib.h> /* for qsort() */
-
-static int
-join_wims(WIMStruct **swms, unsigned num_swms,
-         WIMStruct *joined_wim, int write_flags,
-         wimlib_progress_func_t progress_func)
-{
-       int ret;
-       unsigned i;
-       union wimlib_progress_info progress;
-       u64 total_bytes = 0;
-       u64 part_bytes;
-       u64 swm_part_sizes[num_swms];
-
-       /* Calculate total size of the streams in the split WIM parts. */
-       for (i = 0; i < num_swms; i++) {
-               part_bytes = lookup_table_total_stream_size(swms[i]->lookup_table);
-               swm_part_sizes[i] = part_bytes;
-               total_bytes += part_bytes;
-       }
-
-       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_func(WIMLIB_PROGRESS_MSG_JOIN_STREAMS, &progress);
-       }
-
-       /* Write the non-metadata resources from each SWM part */
-       for (i = 0; i < num_swms; i++) {
-               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_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) {
-                       progress.join.completed_bytes += swm_part_sizes[i];
-                       progress.join.completed_parts++;
-                       progress_func(WIMLIB_PROGRESS_MSG_JOIN_STREAMS, &progress);
-               }
-       }
-
-       /* 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;
-       }
-
-       /* Preserve some of the header flags */
-       joined_wim->hdr.flags |= (swms[0]->hdr.flags &
-                             (WIM_HDR_FLAG_RP_FIX | WIM_HDR_FLAG_READONLY));
-
-       /* Write lookup table, XML data, and optional integrity table */
-       merge_lookup_tables(joined_wim, swms, num_swms);
-       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;
-}
-
-static int
-cmp_swms_by_part_number(const void *swm1, const void *swm2)
-{
-       u16 partno_1 = (*(const WIMStruct**)swm1)->hdr.part_number;
-       u16 partno_2 = (*(const WIMStruct**)swm2)->hdr.part_number;
-       return (int)partno_1 - (int)partno_2;
-}
-
-/*
- * Join a set of split WIMs into a stand-alone WIM.
- */
+/* API function documented in wimlib.h  */

 WIMLIBAPI int
 wimlib_join(const tchar * const *swm_names,
            unsigned num_swms,
 WIMLIBAPI int
 wimlib_join(const tchar * const *swm_names,
            unsigned num_swms,


@@ -133,47 +42,77 @@ wimlib_join(const tchar * const *swm_names,
            wimlib_progress_func_t progress_func)
 {
        int ret;
            wimlib_progress_func_t progress_func)
 {
        int ret;

-       WIMStruct *joined_wim = NULL;

        unsigned i;
        unsigned i;

+       unsigned j;
+       WIMStruct *swm0;
+       WIMStruct **swms;
+       unsigned num_additional_swms;
+       WIMStruct *wim;

 
        swm_open_flags |= WIMLIB_OPEN_FLAG_SPLIT_OK;
 
        swm_open_flags |= WIMLIB_OPEN_FLAG_SPLIT_OK;

-       wim_write_flags &= WIMLIB_WRITE_MASK_PUBLIC;

 
        if (num_swms < 1 || num_swms > 0xffff)
                return WIMLIB_ERR_INVALID_PARAM;
 
        if (num_swms < 1 || num_swms > 0xffff)
                return WIMLIB_ERR_INVALID_PARAM;

+       num_additional_swms = num_swms - 1;
+
+       swms = CALLOC(num_additional_swms, sizeof(swms[0]));
+       if (!swms)
+               return WIMLIB_ERR_NOMEM;

 
 

-       WIMStruct *swms[num_swms];
-       ZERO_ARRAY(swms);
+       swm0 = NULL;
+       for (i = 0, j = 0; i < num_swms; i++) {
+               WIMStruct *swm;

 
 

-       for (i = 0; i < num_swms; i++) {
-               ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swms[i],
+               ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swm,

                                      progress_func);
                if (ret)
                                      progress_func);
                if (ret)

-                       goto out_free_wims;
-
-               /* Don't open all the parts at the same time, in case there are
-                * a lot of them */
-               close_wim(swms[i]);
+                       goto out_free_swms;
+               if (swm->hdr.part_number == 1 && swm0 == NULL)
+                       swm0 = swm;
+               else
+                       swms[j++] = swm;

        }
 
        }
 

-       qsort(swms, num_swms, sizeof(swms[0]), cmp_swms_by_part_number);
+       if (!swm0) {
+               ret = WIMLIB_ERR_SPLIT_INVALID;
+               goto out_free_swms;
+       }

 
 

-       ret = verify_swm_set(swms[0], &swms[1], num_swms - 1);
+       ret = wimlib_create_new_wim(swm0->compression_type, &wim);

        if (ret)
        if (ret)

-               goto out_free_wims;
+               goto out_free_swms;

 
 

-       ret = wimlib_create_new_wim(swms[0]->compression_type, &joined_wim);
+       ret = wimlib_export_image(swm0, WIMLIB_ALL_IMAGES,
+                                 wim, NULL, NULL, 0,
+                                 swms, num_additional_swms,
+                                 progress_func);

        if (ret)
        if (ret)

-               goto out_free_wims;
+               goto out_free_wim;
+
+       wim->hdr.flags |= swm0->hdr.flags & (WIM_HDR_FLAG_RP_FIX |
+                                            WIM_HDR_FLAG_READONLY);
+       if (!(wim_write_flags & (WIMLIB_WRITE_FLAG_CHECK_INTEGRITY |
+                                WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY)))
+       {
+               if (wim_has_integrity_table(swm0))
+                       wim_write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
+       }
+       if (!(wim_write_flags & (WIMLIB_WRITE_FLAG_PIPABLE |
+                                WIMLIB_WRITE_FLAG_NOT_PIPABLE)))
+       {
+               if (wim_is_pipable(swm0))
+                       wim_write_flags |= WIMLIB_WRITE_FLAG_PIPABLE;
+       }

 
 

-       ret = begin_write(joined_wim, output_path, wim_write_flags);
-       if (ret)
-               goto out_free_wims;
-       ret = join_wims(swms, num_swms, joined_wim, wim_write_flags,
-                       progress_func);
-out_free_wims:
-       for (i = 0; i < num_swms; i++)
+
+       ret = wimlib_write(wim, output_path, WIMLIB_ALL_IMAGES,
+                          wim_write_flags, 1, progress_func);
+out_free_wim:
+       wimlib_free(wim);
+out_free_swms:
+       for (i = 0; i < num_additional_swms; i++)

                wimlib_free(swms[i]);
                wimlib_free(swms[i]);

-       wimlib_free(joined_wim);
+       FREE(swms);
+       wimlib_free(swm0);

        return ret;
 }
        return ret;
 }