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 8a0abe5d663e912c0a28d6058c820cd368eebedc..3a60f1c9a6c4e632f5506f22ba91d4b16c54c51b 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -112,7 +112,7 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
                                      "chunk size");
                                return WIMLIB_ERR_SPLIT_INVALID;
                        }
-                       if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) {
+                       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;
@@ -149,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;
@@ -178,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)
@@ -203,14 +206,14 @@ wimlib_join(const tchar * const *swm_names,
        if (ret)
                goto out_free_swms;
 
-       swm0->guid_set_explicitly = 1;
-
        /* It is reasonably safe to provide, WIMLIB_WRITE_FLAG_STREAMS_OK, as we
         * 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 + 1; i++)
                wimlib_free(additional_swms[i]);
@@ -218,3 +221,16 @@ out_free_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);
+}