win32_capture.c: Fix exclusion when capture path ends in slash

[wimlib] / src / join.c

diff --git a/src/join.c b/src/join.c
index d52bd0f242f1d4cab3d82588d3ba571e37243c05..3a60f1c9a6c4e632f5506f22ba91d4b16c54c51b 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -38,17 +38,17 @@
  *                  correspond to a spanned set.
  *
  * @wim:
- *     Part 1 of the set.
+ *     Part 1 of the set.
  *
  * @additional_swms:
- *     All parts of the set other than part 1.
+ *     All parts of the set other than part 1.
  *
  * @num_additional_swms:
- *     Number of WIMStructs in @additional_swms.  Or, the total number of parts
- *     in the set minus 1.
+ *     Number of WIMStructs in @additional_swms.  Or, the total number of parts
+ *     in the set minus 1.
  *
  * @return:
- *     0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid.
+ *     0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid.
  */
 static int
 verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
@@ -56,6 +56,7 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
 {
        unsigned total_parts = wim->hdr.total_parts;
        int ctype;
+       u32 chunk_size;
        const u8 *guid;
 
        if (total_parts != num_additional_swms + 1) {
@@ -83,9 +84,10 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
                }
        }
 
-       /* keep track of ctype and guid just to make sure they are the same for
-        * all the WIMs. */
+       /* Keep track of the compression type, chunk size, and GUID to make sure
+        * they are the same for all the WIMs.  */
        ctype = wim->compression_type;
+       chunk_size = wim->chunk_size;
        guid = wim->hdr.guid;
 
        {
@@ -104,7 +106,13 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
                                      "compression type");
                                return WIMLIB_ERR_SPLIT_INVALID;
                        }
-                       if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) {
+                       if (swm->chunk_size != chunk_size &&
+                           ctype != WIMLIB_COMPRESSION_TYPE_NONE) {
+                               ERROR("The split WIMs do not all have the same "
+                                     "chunk size");
+                               return WIMLIB_ERR_SPLIT_INVALID;
+                       }
+                       if (memcmp(guid, swm->hdr.guid, WIM_GUID_LEN) != 0) {
                                ERROR("The split WIMs do not all have the same "
                                      "GUID");
                                return WIMLIB_ERR_SPLIT_INVALID;
@@ -141,14 +149,14 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
        return 0;
 }
 
-/* API function documented in wimlib.h  */
 WIMLIBAPI int
-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)
+wimlib_join_with_progress(const tchar * const *swm_names,
+                         unsigned num_swms,
+                         const tchar *output_path,
+                         int swm_open_flags,
+                         int wim_write_flags,
+                         wimlib_progress_func_t progfunc,
+                         void *progctx)
 {
        int ret;
        unsigned i;
@@ -157,13 +165,12 @@ wimlib_join(const tchar * const *swm_names,
        WIMStruct **additional_swms;
        unsigned num_additional_swms;
 
-       swm_open_flags |= WIMLIB_OPEN_FLAG_SPLIT_OK;
-
        if (num_swms < 1 || num_swms > 0xffff)
                return WIMLIB_ERR_INVALID_PARAM;
        num_additional_swms = num_swms - 1;
 
-       additional_swms = CALLOC(num_additional_swms, sizeof(additional_swms[0]));
+       additional_swms = CALLOC((num_additional_swms + 1),
+                                sizeof(additional_swms[0]));
        if (!additional_swms)
                return WIMLIB_ERR_NOMEM;
 
@@ -171,8 +178,11 @@ wimlib_join(const tchar * const *swm_names,
        for (i = 0, j = 0; i < num_swms; i++) {
                WIMStruct *swm;
 
-               ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swm,
-                                     progress_func);
+               ret = wimlib_open_wim_with_progress(swm_names[i],
+                                                   swm_open_flags,
+                                                   &swm,
+                                                   progfunc,
+                                                   progctx);
                if (ret)
                        goto out_free_swms;
                if (swm->hdr.part_number == 1 && swm0 == NULL)
@@ -182,6 +192,7 @@ wimlib_join(const tchar * const *swm_names,
        }
 
        if (!swm0) {
+               ERROR("Part 1 of the split WIM was not specified!");
                ret = WIMLIB_ERR_SPLIT_INVALID;
                goto out_free_swms;
        }
@@ -199,12 +210,27 @@ wimlib_join(const tchar * const *swm_names,
         * have verified that the specified split WIM parts form a spanned set.
         */
        ret = wimlib_write(swm0, output_path, WIMLIB_ALL_IMAGES,
-                          wim_write_flags | WIMLIB_WRITE_FLAG_STREAMS_OK,
-                          1, progress_func);
+                          wim_write_flags |
+                               WIMLIB_WRITE_FLAG_STREAMS_OK |
+                               WIMLIB_WRITE_FLAG_RETAIN_GUID,
+                          1);
 out_free_swms:
-       for (i = 0; i < num_additional_swms; i++)
+       for (i = 0; i < num_additional_swms + 1; i++)
                wimlib_free(additional_swms[i]);
        FREE(additional_swms);
        wimlib_free(swm0);
        return ret;
 }
+
+/* API function documented in wimlib.h  */
+WIMLIBAPI int
+wimlib_join(const tchar * const *swm_names,
+           unsigned num_swms,
+           const tchar *output_path,
+           int swm_open_flags,
+           int wim_write_flags)
+{
+       return wimlib_join_with_progress(swm_names, num_swms, output_path,
+                                        swm_open_flags, wim_write_flags,
+                                        NULL, NULL);
+}