Add WIMLIB_WRITE_FLAG_RETAIN_GUID

[wimlib] / src / join.c

diff --git a/src/join.c b/src/join.c
index b2125d13d5e03f5911ddbcc2b8ce052a632f5077..71e43c099236e6ba7311cdc58a34e1e87416db88 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;
@@ -169,7 +169,8 @@ wimlib_join(const tchar * const *swm_names,
                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;
 
@@ -188,6 +189,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;
        }
@@ -201,16 +203,16 @@ 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,
+                          wim_write_flags |
+                               WIMLIB_WRITE_FLAG_STREAMS_OK |
+                               WIMLIB_WRITE_FLAG_RETAIN_GUID,
                           1, progress_func);
 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);