X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=71e43c099236e6ba7311cdc58a34e1e87416db88;hb=5f8590a7dcdf45a7f56f50ad96ac6349ffbafc08;hp=d52bd0f242f1d4cab3d82588d3ba571e37243c05;hpb=465a630d28e93b09e55ca07b1a6cae8def3b42f5;p=wimlib

diff --git a/src/join.c b/src/join.c
index d52bd0f2..71e43c09 100644
--- 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;
@@ -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;
 
@@ -182,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;
 	}
@@ -199,10 +207,12 @@ 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,
+			   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);