X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsplit.c;h=296b03fafc6bbc585295cdad3f36e657aad026e3;hp=6054d368a7f8a706ec7d0977138dac22643c97e0;hb=630e15501a368eccaf6d0999f330c82a8fd4aa5f;hpb=f8698b9c814a62a117982701b9551f699553b2a4 diff --git a/src/split.c b/src/split.c index 6054d368..296b03fa 100644 --- a/src/split.c +++ b/src/split.c @@ -23,10 +23,22 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -#include "wimlib_internal.h" -#include "lookup_table.h" -#include "xml.h" -#include "buffer_io.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "wimlib.h" +#include "wimlib/endianness.h" +#include "wimlib/error.h" +#include "wimlib/file_io.h" +#include "wimlib/lookup_table.h" +#include "wimlib/metadata.h" +#include "wimlib/types.h" +#include "wimlib/write.h" +#include "wimlib/list.h" + +#include /* for open() */ +#include /* for close() */ struct split_args { WIMStruct *w; @@ -46,35 +58,21 @@ 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) { - ret = write_lookup_table_entry(lte, w->out_fp); - if (ret != 0) - return ret; - } - - off_t xml_data_offset = ftello(w->out_fp); - - if (lookup_table_offset == -1 || xml_data_offset == -1) - return WIMLIB_ERR_WRITE; - w->hdr.lookup_table_res_entry.offset = lookup_table_offset; - w->hdr.lookup_table_res_entry.size = - xml_data_offset - lookup_table_offset; - 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; + ret = write_lookup_table_from_stream_list(lte_list, w->out_fd, + &w->hdr.lookup_table_res_entry); + if (ret) + return ret; return finish_write(w, WIMLIB_ALL_IMAGES, write_flags | WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE, progress_func); } static int -copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args) +copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *_args) { - struct split_args *args = (struct split_args*)__args; + struct split_args *args = (struct split_args*)_args; WIMStruct *w = args->w; int ret; @@ -90,7 +88,7 @@ copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args) ret = finish_swm(w, &args->lte_list, args->write_flags, args->progress_func); - if (ret != 0) + if (ret) return ret; if (args->progress_func) { @@ -113,13 +111,13 @@ copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args) } 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_tail(<e->staging_list, &args->lte_list); + list_add_tail(<e->swm_stream_list, &args->lte_list); return copy_resource(lte, w); } @@ -153,7 +151,7 @@ wimlib_split(WIMStruct *w, const tchar *swm_name, 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; tmemcpy(swm_base_name, swm_name, swm_name_len + 1); @@ -189,24 +187,25 @@ wimlib_split(WIMStruct *w, const tchar *swm_name, 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; /* Careful: The metadata lookup table entries must be added in * order of the images. */ - list_add_tail(&metadata_lte->staging_list, &args.lte_list); + list_add_tail(&metadata_lte->swm_stream_list, &args.lte_list); } - 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) { @@ -220,6 +219,9 @@ wimlib_split(WIMStruct *w, const tchar *swm_name, int total_parts = args.cur_part_number; for (int i = 1; i <= total_parts; i++) { const tchar *part_name; + int part_fd; + int ret2; + if (i == 1) { part_name = swm_name; } else { @@ -228,26 +230,24 @@ wimlib_split(WIMStruct *w, const tchar *swm_name, part_name = swm_base_name; } - FILE *fp = tfopen(part_name, T("r+b")); - if (!fp) { + part_fd = topen(part_name, O_WRONLY | O_BINARY); + if (part_fd == -1) { ERROR_WITH_ERRNO("Failed to open `%"TS"'", part_name); ret = WIMLIB_ERR_OPEN; goto out; } - u8 buf[4]; - put_u16(&buf[0], i); - put_u16(&buf[2], total_parts); - - if (fseek(fp, 40, SEEK_SET) != 0 || - fwrite(buf, 1, sizeof(buf), fp) != sizeof(buf) || - fclose(fp) != 0) - { - ERROR_WITH_ERRNO("Error overwriting header of `%"TS"'", - part_name); + + ret = write_header_part_data(i, total_parts, part_fd); + ret2 = close(part_fd); + if (ret == 0 && ret2 != 0) ret = WIMLIB_ERR_WRITE; - break; + if (ret) { + ERROR_WITH_ERRNO("Error updating header of `%"TS"'", + part_name); + goto out; } } + ret = 0; out: close_wim_writable(w); memcpy(&w->hdr, &hdr_save, sizeof(struct wim_header));