configure.ac: generate version number from git commit and tags

[wimlib] / src / split.c

diff --git a/src/split.c b/src/split.c
index 3f4a7d0a87a170805de89b7cf2072962a6396d67..137585588a98ab5638063233d14eef8cc94c421a 100644 (file)
--- 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"
@@ -44,7 +45,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;
 }
 
@@ -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));
@@ -95,7 +96,6 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
 
        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,
@@ -117,8 +117,6 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
                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,
                                     progress.split.part_name,
                                     WIMLIB_ALL_IMAGES,
@@ -128,7 +126,6 @@ write_split_wim(WIMStruct *orig_wim, const tchar *swm_name,
                                     swm_info->num_parts,
                                     &swm_info->parts[part_number - 1].blob_list,
                                     guid);
-               orig_wim->progfunc = progfunc;
                if (ret)
                        return ret;
 
@@ -144,47 +141,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) {
@@ -219,9 +223,20 @@ wimlib_split(WIMStruct *wim, const tchar *swm_name,
                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);