char *swm_base_name;
size_t swm_base_name_len;
const char *swm_suffix;
- struct list_head *lte_list;
- int part_number;
+ struct list_head lte_list;
+ int cur_part_number;
int write_flags;
long size_remaining;
size_t part_size;
- u64 total_bytes;
- u64 total_bytes_written;
+ wimlib_progress_func_t progress_func;
+ union wimlib_progress_info progress;
};
static int finish_swm(WIMStruct *w, struct list_head *lte_list,
- int write_flags)
+ int write_flags, wimlib_progress_func_t progress_func)
{
off_t lookup_table_offset = ftello(w->out_fp);
int ret;
struct lookup_table_entry *lte;
- DEBUG("Writing lookup table for SWM (offset %"PRIu64")",
- lookup_table_offset);
-
list_for_each_entry(lte, lte_list, staging_list) {
ret = write_lookup_table_entry(lte, w->out_fp);
if (ret != 0)
w->hdr.lookup_table_res_entry.original_size =
xml_data_offset - lookup_table_offset;
w->hdr.lookup_table_res_entry.flags = WIM_RESHDR_FLAG_METADATA;
- return finish_write(w, WIM_ALL_IMAGES,
- write_flags | WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE);
+ return finish_write(w, WIMLIB_ALL_IMAGES,
+ write_flags | WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE,
+ progress_func);
}
static int copy_resource_to_swm(struct lookup_table_entry *lte, void *__args)
/* No space for this resource. Finish the previous swm and
* start a new one. */
- ret = finish_swm(w, args->lte_list, args->write_flags);
+ ret = finish_swm(w, &args->lte_list, args->write_flags,
+ args->progress_func);
if (ret != 0)
return ret;
- INIT_LIST_HEAD(args->lte_list);
+
+ if (args->progress_func) {
+ args->progress_func(WIMLIB_PROGRESS_MSG_SPLIT_END_PART,
+ &args->progress);
+ }
+
+ INIT_LIST_HEAD(&args->lte_list);
+ args->cur_part_number++;
sprintf(args->swm_base_name + args->swm_base_name_len, "%d%s",
- ++args->part_number, args->swm_suffix);
+ args->cur_part_number, args->swm_suffix);
- w->hdr.part_number = args->part_number;
+ w->hdr.part_number = args->cur_part_number;
- if (args->write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
- printf("Writing `%s' (%"PRIu64" of %"PRIu64" bytes, "
- "%.0f%% done)\n",
- args->swm_base_name,
- args->total_bytes_written,
- args->total_bytes,
- (double)args->total_bytes_written /
- (double)args->total_bytes * 100.0);
+ if (args->progress_func) {
+ args->progress.split.cur_part_number = args->cur_part_number;
+ args->progress_func(WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART,
+ &args->progress);
+ }
ret = begin_write(w, args->swm_base_name, args->write_flags);
if (ret != 0)
args->size_remaining = args->part_size;
}
args->size_remaining -= lte->resource_entry.size;
- args->total_bytes_written += lte->resource_entry.size;
- list_add(<e->staging_list, args->lte_list);
+ args->progress.split.completed_bytes += lte->resource_entry.size;
+ list_add(<e->staging_list, &args->lte_list);
return copy_resource(lte, w);
}
/* Splits the WIM file @wimfile into multiple parts prefixed by @swm_name with
* size at most @part_size. */
-WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name,
- size_t part_size, int flags)
+WIMLIBAPI int wimlib_split(WIMStruct *w, const char *swm_name,
+ size_t part_size, int write_flags,
+ wimlib_progress_func_t progress_func)
{
int ret;
- WIMStruct *w;
- int write_flags = 0;
- size_t swm_name_len = strlen(swm_name);
+ struct wim_header hdr_save;
+ struct split_args args;
+ const char *swm_suffix;
+ size_t swm_name_len;
size_t swm_base_name_len;
- char name[swm_name_len + 20];
- char *swm_suffix;
- long size_remaining = part_size;
- u64 total_bytes_written = 0;
- u64 total_bytes;
+ if (!w || !swm_name || part_size == 0)
+ return WIMLIB_ERR_INVALID_PARAM;
- ret = wimlib_open_wim(wimfile, flags, &w);
- if (ret != 0)
- return ret;
+ if (w->hdr.total_parts != 1)
+ return WIMLIB_ERR_SPLIT_UNSUPPORTED;
- total_bytes = wim_info_get_total_bytes(w->wim_info);
+ write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
- if (flags & WIMLIB_OPEN_FLAG_CHECK_INTEGRITY)
- write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
- if (flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
- write_flags |= WIMLIB_WRITE_FLAG_SHOW_PROGRESS;
+ swm_name_len = strlen(swm_name);
+ char swm_base_name[swm_name_len + 20];
+ memcpy(&hdr_save, &w->hdr, sizeof(struct wim_header));
w->hdr.flags |= WIM_HDR_FLAG_SPANNED;
w->hdr.boot_idx = 0;
randomize_byte_array(w->hdr.guid, WIM_GID_LEN);
ret = begin_write(w, swm_name, write_flags);
if (ret != 0)
- return ret;
+ goto out;
+
+ memcpy(swm_base_name, swm_name, swm_name_len + 1);
swm_suffix = strchr(swm_name, '.');
- memcpy(name, swm_name, swm_name_len + 1);
if (swm_suffix) {
swm_base_name_len = swm_suffix - swm_name;
} else {
swm_base_name_len = swm_name_len;
- name[sizeof(name) - 1] = '\0';
- swm_suffix = &name[sizeof(name) - 1];
+ swm_base_name[sizeof(swm_base_name) - 1] = '\0';
+ swm_suffix = &swm_base_name[sizeof(swm_base_name) - 1];
}
- if (write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
- printf("Writing `%s' (%.2f %% done)\n",
- swm_name,
- (double)total_bytes_written /
- (double)total_bytes * 100.0);
+ args.w = w;
+ args.swm_base_name = swm_base_name;
+ args.swm_base_name_len = swm_base_name_len;
+ args.swm_suffix = swm_suffix;
+ INIT_LIST_HEAD(&args.lte_list);
+ args.cur_part_number = 1;
+ args.write_flags = write_flags;
+ args.size_remaining = part_size;
+ args.part_size = part_size;
+ args.progress_func = progress_func;
+ args.progress.split.total_bytes = lookup_table_total_stream_size(w->lookup_table);
+ args.progress.split.cur_part_number = 1;
+ args.progress.split.completed_bytes = 0;
+ args.progress.split.part_name = swm_base_name;
+
+ if (progress_func) {
+ progress_func(WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART,
+ &args.progress);
+ }
w->write_metadata = true;
- LIST_HEAD(lte_list);
for (int i = 0; i < w->hdr.image_count; i++) {
struct lookup_table_entry *metadata_lte;
-
- DEBUG("Writing metadata resource %d", i);
-
metadata_lte = w->image_metadata[i].metadata_lte;
ret = copy_resource(metadata_lte, w);
if (ret != 0)
- return ret;
- size_remaining -= metadata_lte->resource_entry.size;
- total_bytes_written += metadata_lte->resource_entry.size;
- list_add(&metadata_lte->staging_list, <e_list);
+ goto out;
+ args.size_remaining -= metadata_lte->resource_entry.size;
+ args.progress.split.completed_bytes += metadata_lte->resource_entry.size;
+ list_add(&metadata_lte->staging_list, &args.lte_list);
}
w->write_metadata = false;
- struct split_args args = {
- .w = w,
- .swm_base_name = name,
- .swm_base_name_len = swm_base_name_len,
- .swm_suffix = swm_suffix,
- .lte_list = <e_list,
- .part_number = 1,
- .write_flags = write_flags,
- .size_remaining = size_remaining,
- .part_size = part_size,
- .total_bytes = total_bytes,
- .total_bytes_written = total_bytes_written,
- };
-
- ret = for_lookup_table_entry(w->lookup_table, copy_resource_to_swm, &args);
+ ret = for_lookup_table_entry(w->lookup_table,
+ copy_resource_to_swm, &args);
if (ret != 0)
- return ret;
+ goto out;
- ret = finish_swm(w, <e_list, write_flags);
+ ret = finish_swm(w, &args.lte_list, write_flags, progress_func);
if (ret != 0)
- return ret;
+ goto out;
+ if (progress_func) {
+ progress_func(WIMLIB_PROGRESS_MSG_SPLIT_END_PART,
+ &args.progress);
+ }
/* The swms are all ready now, except the total_parts and part_number
* fields in their headers are wrong (we don't know the total parts
* until they are all written). Fix them. */
- int total_parts = args.part_number;
+ int total_parts = args.cur_part_number;
for (int i = 1; i <= total_parts; i++) {
- const char *p;
+ const char *part_name;
if (i == 1) {
- p = swm_name;
+ part_name = swm_name;
} else {
- sprintf(name + swm_base_name_len, "%d", i);
- p = strcat(name, swm_suffix);
+ sprintf(swm_base_name + swm_base_name_len, "%d%s",
+ i, swm_suffix);
+ part_name = swm_base_name;
}
- FILE *fp = fopen(p, "r+b");
+ FILE *fp = fopen(part_name, "r+b");
if (!fp) {
- ERROR_WITH_ERRNO("Failed to open `%s'", p);
- return WIMLIB_ERR_OPEN;
+ ERROR_WITH_ERRNO("Failed to open `%s'", part_name);
+ ret = WIMLIB_ERR_OPEN;
+ goto out;
}
u8 buf[4];
put_u16(&buf[0], i);
fwrite(buf, 1, sizeof(buf), fp) != sizeof(buf)
|| fclose(fp) != 0) {
ERROR_WITH_ERRNO("Error overwriting header of `%s'",
- name);
- return WIMLIB_ERR_WRITE;
+ part_name);
+ ret = WIMLIB_ERR_WRITE;
+ break;
}
}
- if (write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
- puts("Done!");
- wimlib_free(w);
- return 0;
+out:
+ memcpy(&w->hdr, &hdr_save, sizeof(struct wim_header));
+ return ret;
}
git://wimlib.net / wimlib / blobdiff