X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsplit.c;h=7f04648516865027d0ce41171259cf3ce249fea7;hp=2d855a6f0e10df18514f4cb3dd13367dd37782e0;hb=fe548d263d477a745dfa5057f540cc5c35ecce89;hpb=da295f258b60e1593de305385c0669eac4b76644

diff --git a/src/split.c b/src/split.c
index 2d855a6f..7f046485 100644
--- a/src/split.c
+++ b/src/split.c
@@ -32,6 +32,7 @@
 #include "wimlib/list.h"
 #include "wimlib/lookup_table.h"
 #include "wimlib/metadata.h"
+#include "wimlib/progress.h"
 #include "wimlib/resource.h"
 #include "wimlib/wim.h"
 #include "wimlib/write.h"
@@ -64,8 +65,7 @@ struct swm_info {
 
 static int
 write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
-		struct swm_info *swm_info, int write_flags,
-		wimlib_progress_func_t progress_func)
+		struct swm_info *swm_info, int write_flags)
 {
 	size_t swm_name_len;
 	tchar *swm_name_buf;
@@ -97,12 +97,12 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
 	for (part_number = 1; part_number <= swm_info->num_parts; part_number++)
 		progress.split.total_bytes += swm_info->parts[part_number - 1].size;
 	progress.split.total_parts = swm_info->num_parts;
-	progress.split.part_name = swm_name_buf;
 
 	randomize_byte_array(guid, WIMLIB_GUID_LEN);
 
 	for (part_number = 1; part_number <= swm_info->num_parts; part_number++) {
 		int part_write_flags;
+		wimlib_progress_func_t progfunc;
 
 		if (part_number != 1) {
 			tsprintf(swm_name_buf + swm_base_name_len,
@@ -110,34 +110,43 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
 		}
 
 		progress.split.cur_part_number = part_number;
-		if (progress_func) {
-			progress_func(WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART,
-				      &progress);
-		}
+		progress.split.part_name = swm_name_buf;
+
+		ret = call_progress(orig_wim->progfunc,
+				    WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART,
+				    &progress,
+				    orig_wim->progctx);
+		if (ret)
+			return ret;
 
-		part_write_flags = write_flags & WIMLIB_WRITE_MASK_PUBLIC;
+		part_write_flags = write_flags;
 		part_write_flags |= WIMLIB_WRITE_FLAG_USE_EXISTING_TOTALBYTES;
 		if (part_number != 1)
 			part_write_flags |= WIMLIB_WRITE_FLAG_NO_METADATA;
 
+		progfunc = orig_wim->progfunc;
+		orig_wim->progfunc = NULL;
 		ret = write_wim_part(orig_wim,
-				     swm_name_buf,
+				     progress.split.part_name,
 				     WIMLIB_ALL_IMAGES,
 				     part_write_flags,
 				     1,
-				     NULL,
 				     part_number,
 				     swm_info->num_parts,
 				     &swm_info->parts[part_number - 1].stream_list,
 				     guid);
+		orig_wim->progfunc = progfunc;
 		if (ret)
 			return ret;
 
 		progress.split.completed_bytes += swm_info->parts[part_number - 1].size;
-		if (progress_func) {
-			progress_func(WIMLIB_PROGRESS_MSG_SPLIT_END_PART,
-				      &progress);
-		}
+
+		ret = call_progress(orig_wim->progfunc,
+				    WIMLIB_PROGRESS_MSG_SPLIT_END_PART,
+				    &progress,
+				    orig_wim->progctx);
+		if (ret)
+			return ret;
 	}
 	return 0;
 }
@@ -148,7 +157,15 @@ add_stream_to_swm(struct wim_lookup_table_entry *lte, void *_swm_info)
 	struct swm_info *swm_info = _swm_info;
 	u64 stream_size;
 
-	stream_size = lte->resource_entry.size;
+	if (lte_is_partial(lte)) {
+		ERROR("Splitting of WIM containing packed streams is not supported.\n"
+		      "        Export it in the default format first.");
+		return WIMLIB_ERR_UNSUPPORTED;
+	}
+	if (lte->resource_location == RESOURCE_IN_WIM)
+		stream_size = lte->rspec->size_in_wim;
+	else
+		stream_size = lte->size;
 
 	/* - Start first part if no parts have been started so far;
 	 * - Start next part if adding this stream exceeds maximum part size,
@@ -158,7 +175,7 @@ add_stream_to_swm(struct wim_lookup_table_entry *lte, void *_swm_info)
 	if (swm_info->num_parts == 0 ||
 	    ((swm_info->parts[swm_info->num_parts - 1].size +
 			stream_size >= swm_info->max_part_size)
-	     && !((lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) ||
+	     && !((lte->flags & WIM_RESHDR_FLAG_METADATA) ||
 		   swm_info->parts[swm_info->num_parts - 1].size == 0)))
 	{
 		if (swm_info->num_parts == swm_info->num_alloc_parts) {
@@ -182,7 +199,7 @@ add_stream_to_swm(struct wim_lookup_table_entry *lte, void *_swm_info)
 		swm_info->parts[swm_info->num_parts - 1].size = 0;
 	}
 	swm_info->parts[swm_info->num_parts - 1].size += stream_size;
-	if (!(lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA)) {
+	if (!(lte->flags & WIM_RESHDR_FLAG_METADATA)) {
 		list_add_tail(&lte->write_streams_list,
 			      &swm_info->parts[swm_info->num_parts - 1].stream_list);
 	}
@@ -193,8 +210,7 @@ add_stream_to_swm(struct wim_lookup_table_entry *lte, void *_swm_info)
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_split(WIMStruct *wim, const tchar *swm_name,
-	     u64 part_size, int write_flags,
-	     wimlib_progress_func_t progress_func)
+	     u64 part_size, int write_flags)
 {
 	struct swm_info swm_info;
 	unsigned i;
@@ -203,9 +219,12 @@ wimlib_split(WIMStruct *wim, const tchar *swm_name,
 	if (swm_name == NULL || swm_name[0] == T('\0') || part_size == 0)
 		return WIMLIB_ERR_INVALID_PARAM;
 
-	if (!wim_has_metadata(wim))
+	if (write_flags & ~WIMLIB_WRITE_MASK_PUBLIC)
 		return WIMLIB_ERR_INVALID_PARAM;
 
+	if (!wim_has_metadata(wim))
+		return WIMLIB_ERR_METADATA_NOT_FOUND;
+
 	memset(&swm_info, 0, sizeof(swm_info));
 	swm_info.max_part_size = part_size;
 
@@ -222,8 +241,7 @@ wimlib_split(WIMStruct *wim, const tchar *swm_name,
 	if (ret)
 		goto out_free_swm_info;
 
-	ret = write_split_wim(wim, swm_name, &swm_info, write_flags,
-			      progress_func);
+	ret = write_split_wim(wim, swm_name, &swm_info, write_flags);
 out_free_swm_info:
 	FREE(swm_info.parts);
 	return ret;