wimlib_split(): fix bug where no parts would be written if WIM contained no images

[wimlib] / src / split.c

diff --git a/src/split.c b/src/split.c
index 43d26db29d0d614cde517437878099159ac2e323..795fb2cf4f269b7a6b3de6fb73613a749ffc959b 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -44,7 +44,7 @@ struct swm_part_info {
 static void
 copy_part_info(struct swm_part_info *dst, struct swm_part_info *src)
 {
-       list_transfer(&src->blob_list, &dst->blob_list);
+       list_replace(&src->blob_list, &dst->blob_list);
        dst->size = src->size;
 }
 
@@ -69,7 +69,7 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
        union wimlib_progress_info progress;
        unsigned part_number;
        int ret;
-       u8 guid[WIMLIB_GUID_LEN];
+       u8 guid[GUID_SIZE];
 
        swm_name_len = tstrlen(swm_name);
        swm_name_buf = alloca((swm_name_len + 20) * sizeof(tchar));
@@ -91,7 +91,7 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
                progress.split.total_bytes += swm_info->parts[part_number - 1].size;
        progress.split.total_parts = swm_info->num_parts;
 
-       randomize_byte_array(guid, WIMLIB_GUID_LEN);
+       generate_guid(guid);
 
        for (part_number = 1; part_number <= swm_info->num_parts; part_number++) {
                int part_write_flags;
@@ -144,55 +144,57 @@ 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_is_in_solid_wim_resource(blob)) {
-               ERROR("Splitting of WIM containing solid resources is not supported.\n"
-                     "        Export it in non-solid format first.");
-               return WIMLIB_ERR_UNSUPPORTED;
-       }
        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->flags & WIM_RESHDR_FLAG_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->flags & WIM_RESHDR_FLAG_METADATA)) {
+       if (!blob->is_metadata) {
                list_add_tail(&blob->write_blobs_list,
                              &swm_info->parts[swm_info->num_parts - 1].blob_list);
        }
@@ -218,9 +220,26 @@ wimlib_split(WIMStruct *wim, const tchar *swm_name,
        if (!wim_has_metadata(wim))
                return WIMLIB_ERR_METADATA_NOT_FOUND;
 
+       if (wim_has_solid_resources(wim)) {
+               ERROR("Splitting of WIM containing solid resources is not supported.\n"
+                     "        Export it in non-solid format first.");
+               return WIMLIB_ERR_UNSUPPORTED;
+       }
+
+       for (i = 0; i < wim->hdr.image_count; i++) {
+               if (!is_image_unchanged_from_wim(wim->image_metadata[i], wim)) {
+                       ERROR("Only an unmodified, on-disk WIM file can be split.");
+                       return WIMLIB_ERR_UNSUPPORTED;
+               }
+       }
+
        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);