X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsplit.c;h=1313a59aa10ef03c36101ed99508db9206fc2034;hp=07106746f484885cbe90771b0c139007400ab3f5;hb=06be73db2299bf580cfc4197099bce8547472825;hpb=db7eada462796f7181106168c581bd3ff8c639a0

diff --git a/src/split.c b/src/split.c
index 07106746..1313a59a 100644
--- a/src/split.c
+++ b/src/split.c
@@ -31,6 +31,7 @@
 #include "wimlib/error.h"
 #include "wimlib/list.h"
 #include "wimlib/metadata.h"
+#include "wimlib/paths.h"
 #include "wimlib/progress.h"
 #include "wimlib/resource.h"
 #include "wimlib/wim.h"
@@ -74,7 +75,7 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
 	swm_name_len = tstrlen(swm_name);
 	swm_name_buf = alloca((swm_name_len + 20) * sizeof(tchar));
 	tstrcpy(swm_name_buf, swm_name);
-	dot = tstrchr(swm_name_buf, T('.'));
+	dot = tstrrchr(path_basename(swm_name_buf), T('.'));
 	if (dot) {
 		swm_base_name_len = dot - swm_name_buf;
 		swm_suffix = alloca((tstrlen(dot) + 1) * sizeof(tchar));
@@ -144,47 +145,54 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
 	return 0;
 }
 
+static int
+start_new_swm_part(struct swm_info *swm_info)
+{
+	if (swm_info->num_parts == swm_info->num_alloc_parts) {
+		struct swm_part_info *parts;
+		size_t num_alloc_parts = swm_info->num_alloc_parts;
+
+		num_alloc_parts += 8;
+		parts = MALLOC(num_alloc_parts * sizeof(parts[0]));
+		if (!parts)
+			return WIMLIB_ERR_NOMEM;
+
+		for (unsigned i = 0; i < swm_info->num_parts; i++)
+			copy_part_info(&parts[i], &swm_info->parts[i]);
+
+		FREE(swm_info->parts);
+		swm_info->parts = parts;
+		swm_info->num_alloc_parts = num_alloc_parts;
+	}
+	swm_info->num_parts++;
+	INIT_LIST_HEAD(&swm_info->parts[swm_info->num_parts - 1].blob_list);
+	swm_info->parts[swm_info->num_parts - 1].size = 0;
+	return 0;
+}
+
 static int
 add_blob_to_swm(struct blob_descriptor *blob, void *_swm_info)
 {
 	struct swm_info *swm_info = _swm_info;
 	u64 blob_stored_size;
+	int ret;
 
 	if (blob->blob_location == BLOB_IN_WIM)
 		blob_stored_size = blob->rdesc->size_in_wim;
 	else
 		blob_stored_size = blob->size;
 
-	/* - Start first part if no parts have been started so far;
-	 * - Start next part if adding this blob exceeds maximum part size,
-	 *   UNLESS the blob is metadata or if no blobs at all have been added
-	 *   to the current part.
-	 */
-	if (swm_info->num_parts == 0 ||
-	    ((swm_info->parts[swm_info->num_parts - 1].size +
-			blob_stored_size >= swm_info->max_part_size)
-	     && !(blob->is_metadata ||
-		  swm_info->parts[swm_info->num_parts - 1].size == 0)))
+	/* Start the next part if adding this blob exceeds the maximum part
+	 * size, UNLESS the blob is metadata or if no blobs at all have been
+	 * added to the current part.  */
+	if ((swm_info->parts[swm_info->num_parts - 1].size +
+	     blob_stored_size >= swm_info->max_part_size)
+	    && !(blob->is_metadata ||
+		 swm_info->parts[swm_info->num_parts - 1].size == 0))
 	{
-		if (swm_info->num_parts == swm_info->num_alloc_parts) {
-			struct swm_part_info *parts;
-			size_t num_alloc_parts = swm_info->num_alloc_parts;
-
-			num_alloc_parts += 8;
-			parts = MALLOC(num_alloc_parts * sizeof(parts[0]));
-			if (!parts)
-				return WIMLIB_ERR_NOMEM;
-
-			for (unsigned i = 0; i < swm_info->num_parts; i++)
-				copy_part_info(&parts[i], &swm_info->parts[i]);
-
-			FREE(swm_info->parts);
-			swm_info->parts = parts;
-			swm_info->num_alloc_parts = num_alloc_parts;
-		}
-		swm_info->num_parts++;
-		INIT_LIST_HEAD(&swm_info->parts[swm_info->num_parts - 1].blob_list);
-		swm_info->parts[swm_info->num_parts - 1].size = 0;
+		ret = start_new_swm_part(swm_info);
+		if (ret)
+			return ret;
 	}
 	swm_info->parts[swm_info->num_parts - 1].size += blob_stored_size;
 	if (!blob->is_metadata) {
@@ -229,6 +237,10 @@ wimlib_split(WIMStruct *wim, const tchar *swm_name,
 	memset(&swm_info, 0, sizeof(swm_info));
 	swm_info.max_part_size = part_size;
 
+	ret = start_new_swm_part(&swm_info);
+	if (ret)
+		goto out_free_swm_info;
+
 	for (i = 0; i < wim->hdr.image_count; i++) {
 		ret = add_blob_to_swm(wim->image_metadata[i]->metadata_blob,
 				      &swm_info);