wimlib_overwrite()): Change WIM version when appropriate

[wimlib] / src / split.c

diff --git a/src/split.c b/src/split.c
index 2d855a6f0e10df18514f4cb3dd13367dd37782e0..01bb75fc817f5ba3f211b659252e61c7c5750bf5 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -148,7 +148,13 @@ 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;
+       /* We want the compressed size of the stream, but use the uncompressed
+        * size if the compressed size is not available or not relevant.  */
+       if (lte->resource_location == RESOURCE_IN_WIM &&
+           (!lte_is_partial(lte) || lte->rspec->size_in_wim < lte->size))
+               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 +164,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 +188,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);
        }
@@ -204,7 +210,7 @@ wimlib_split(WIMStruct *wim, const tchar *swm_name,
                return WIMLIB_ERR_INVALID_PARAM;
 
        if (!wim_has_metadata(wim))
-               return WIMLIB_ERR_INVALID_PARAM;
+               return WIMLIB_ERR_METADATA_NOT_FOUND;
 
        memset(&swm_info, 0, sizeof(swm_info));
        swm_info.max_part_size = part_size;