*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
struct split_args {
WIMStruct *w;
- char *swm_base_name;
+ tchar *swm_base_name;
size_t swm_base_name_len;
- const char *swm_suffix;
+ const tchar *swm_suffix;
struct list_head lte_list;
int cur_part_number;
int write_flags;
union wimlib_progress_info progress;
};
-static int finish_swm(WIMStruct *w, struct list_head *lte_list,
- int write_flags, wimlib_progress_func_t progress_func)
+static int
+finish_swm(WIMStruct *w, struct list_head *lte_list,
+ int write_flags, wimlib_progress_func_t progress_func)
{
off_t lookup_table_offset = ftello(w->out_fp);
int ret;
struct wim_lookup_table_entry *lte;
- list_for_each_entry(lte, lte_list, staging_list) {
+ list_for_each_entry(lte, lte_list, swm_stream_list) {
ret = write_lookup_table_entry(lte, w->out_fp);
- if (ret != 0)
+ if (ret)
return ret;
}
progress_func);
}
-static int copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args)
+static int
+copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args)
{
struct split_args *args = (struct split_args*)__args;
WIMStruct *w = args->w;
ret = finish_swm(w, &args->lte_list, args->write_flags,
args->progress_func);
- if (ret != 0)
+ if (ret)
return ret;
if (args->progress_func) {
INIT_LIST_HEAD(&args->lte_list);
args->cur_part_number++;
- sprintf(args->swm_base_name + args->swm_base_name_len, "%d%s",
- args->cur_part_number, args->swm_suffix);
+ tsprintf(args->swm_base_name + args->swm_base_name_len, T("%d%"TS),
+ args->cur_part_number, args->swm_suffix);
w->hdr.part_number = args->cur_part_number;
}
ret = begin_write(w, args->swm_base_name, args->write_flags);
- if (ret != 0)
+ if (ret)
return ret;
args->size_remaining = args->part_size;
}
args->size_remaining -= lte->resource_entry.size;
args->progress.split.completed_bytes += lte->resource_entry.size;
- list_add(<e->staging_list, &args->lte_list);
+ list_add_tail(<e->swm_stream_list, &args->lte_list);
return copy_resource(lte, w);
}
/* Splits the WIM file @w into multiple parts prefixed by @swm_name with size at
* most @part_size bytes. */
-WIMLIBAPI int wimlib_split(WIMStruct *w, const char *swm_name,
- size_t part_size, int write_flags,
- wimlib_progress_func_t progress_func)
+WIMLIBAPI int
+wimlib_split(WIMStruct *w, const tchar *swm_name,
+ size_t part_size, int write_flags,
+ wimlib_progress_func_t progress_func)
{
int ret;
struct wim_header hdr_save;
struct split_args args;
- const char *swm_suffix;
+ const tchar *swm_suffix;
size_t swm_name_len;
size_t swm_base_name_len;
write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
- swm_name_len = strlen(swm_name);
- char swm_base_name[swm_name_len + 20];
+ ret = wim_checksum_unhashed_streams(w);
+ if (ret)
+ return ret;
+
+ swm_name_len = tstrlen(swm_name);
+ tchar 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)
+ if (ret)
goto out;
- memcpy(swm_base_name, swm_name, swm_name_len + 1);
+ tmemcpy(swm_base_name, swm_name, swm_name_len + 1);
- swm_suffix = strchr(swm_name, '.');
+ swm_suffix = tstrchr(swm_name, T('.'));
if (swm_suffix) {
swm_base_name_len = swm_suffix - swm_name;
} else {
swm_base_name_len = swm_name_len;
- swm_base_name[sizeof(swm_base_name) - 1] = '\0';
- swm_suffix = &swm_base_name[sizeof(swm_base_name) - 1];
+ swm_base_name[ARRAY_LEN(swm_base_name) - 1] = T('\0');
+ swm_suffix = &swm_base_name[ARRAY_LEN(swm_base_name) - 1];
}
args.w = w;
&args.progress);
}
- w->write_metadata = true;
for (int i = 0; i < w->hdr.image_count; i++) {
struct wim_lookup_table_entry *metadata_lte;
- metadata_lte = w->image_metadata[i].metadata_lte;
+ metadata_lte = w->image_metadata[i]->metadata_lte;
ret = copy_resource(metadata_lte, w);
- if (ret != 0)
+ if (ret)
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);
+ /* Careful: The metadata lookup table entries must be added in
+ * order of the images. */
+ list_add_tail(&metadata_lte->swm_stream_list, &args.lte_list);
}
- w->write_metadata = false;
- ret = for_lookup_table_entry(w->lookup_table,
- copy_resource_to_swm, &args);
- if (ret != 0)
+ ret = for_lookup_table_entry_pos_sorted(w->lookup_table,
+ copy_resource_to_swm,
+ &args);
+ if (ret)
goto out;
ret = finish_swm(w, &args.lte_list, write_flags, progress_func);
- if (ret != 0)
+ if (ret)
goto out;
if (progress_func) {
* parts until they are all written). Fix them. */
int total_parts = args.cur_part_number;
for (int i = 1; i <= total_parts; i++) {
- const char *part_name;
+ const tchar *part_name;
if (i == 1) {
part_name = swm_name;
} else {
- sprintf(swm_base_name + swm_base_name_len, "%d%s",
- i, swm_suffix);
+ tsprintf(swm_base_name + swm_base_name_len, T("%d%"TS),
+ i, swm_suffix);
part_name = swm_base_name;
}
- FILE *fp = fopen(part_name, "r+b");
+ FILE *fp = tfopen(part_name, T("r+b"));
if (!fp) {
- ERROR_WITH_ERRNO("Failed to open `%s'", part_name);
+ ERROR_WITH_ERRNO("Failed to open `%"TS"'", part_name);
ret = WIMLIB_ERR_OPEN;
goto out;
}
fwrite(buf, 1, sizeof(buf), fp) != sizeof(buf) ||
fclose(fp) != 0)
{
- ERROR_WITH_ERRNO("Error overwriting header of `%s'",
+ ERROR_WITH_ERRNO("Error overwriting header of `%"TS"'",
part_name);
ret = WIMLIB_ERR_WRITE;
break;
git://wimlib.net / wimlib / blobdiff