"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;
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;
}
if (!swm0) {
+ ERROR("Part 1 of the split WIM was not specified!");
ret = WIMLIB_ERR_SPLIT_INVALID;
goto out_free_swms;
}
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);