X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsplit.c;h=6054d368a7f8a706ec7d0977138dac22643c97e0;hp=8b12fb268e8af1deb616dff4b59e4691a10ed5b0;hb=f8698b9c814a62a117982701b9551f699553b2a4;hpb=10a87017a0a82d34ed3981e1f5e586b5b8613e3f diff --git a/src/split.c b/src/split.c index 8b12fb26..6054d368 100644 --- a/src/split.c +++ b/src/split.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2012, 2013 Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -30,9 +30,9 @@ 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; @@ -42,8 +42,9 @@ struct split_args { 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; @@ -70,7 +71,8 @@ static int finish_swm(WIMStruct *w, struct list_head *lte_list, 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; @@ -99,8 +101,8 @@ static int copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args 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; @@ -117,20 +119,21 @@ static int copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args } 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->staging_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; @@ -142,8 +145,8 @@ WIMLIBAPI int wimlib_split(WIMStruct *w, const char *swm_name, write_flags &= WIMLIB_WRITE_MASK_PUBLIC; - swm_name_len = strlen(swm_name); - char swm_base_name[swm_name_len + 20]; + 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; @@ -153,15 +156,15 @@ WIMLIBAPI int wimlib_split(WIMStruct *w, const char *swm_name, if (ret != 0) 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; @@ -184,7 +187,6 @@ WIMLIBAPI int wimlib_split(WIMStruct *w, const char *swm_name, &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; @@ -193,9 +195,10 @@ WIMLIBAPI int wimlib_split(WIMStruct *w, const char *swm_name, 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->staging_list, &args.lte_list); } - w->write_metadata = false; ret = for_lookup_table_entry(w->lookup_table, copy_resource_to_swm, &args); @@ -216,18 +219,18 @@ WIMLIBAPI int wimlib_split(WIMStruct *w, const char *swm_name, * 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; } @@ -239,7 +242,7 @@ WIMLIBAPI int wimlib_split(WIMStruct *w, const char *swm_name, 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;