X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsplit.c;h=78dc8ab74d0ec40d107a104bfb3d3e1e3cbdd778;hp=660ffaf76e76346bf57661203dbe05a028a0768a;hb=30ba1eb06caca0b20a47d8dd75a117c82d730da7;hpb=13c6ce3160fce7c40008d1d182325c8b42450d1e diff --git a/src/split.c b/src/split.c index 660ffaf7..78dc8ab7 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); } @@ -145,6 +143,10 @@ wimlib_split(WIMStruct *w, const tchar *swm_name, write_flags &= WIMLIB_WRITE_MASK_PUBLIC; + ret = wim_checksum_unhashed_streams(w); + if (ret) + return ret; + swm_name_len = tstrlen(swm_name); tchar swm_base_name[swm_name_len + 20]; @@ -153,7 +155,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); @@ -197,17 +199,17 @@ wimlib_split(WIMStruct *w, const tchar *swm_name, 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_pos_sorted(w->lookup_table, copy_resource_to_swm, &args); - if (ret != 0) + 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) { @@ -221,6 +223,10 @@ 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; + le16 part_data[2]; + size_t bytes_written; + if (i == 1) { part_name = swm_name; } else { @@ -229,26 +235,26 @@ 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_data[0] = cpu_to_le16(i); + part_data[1] = cpu_to_le16(total_parts); + + bytes_written = full_pwrite(part_fd, part_data, + sizeof(part_data), 40); + ret = close(part_fd); + if (bytes_written != sizeof(part_data) || ret != 0) { + ERROR_WITH_ERRNO("Error updating header of `%"TS"'", part_name); ret = WIMLIB_ERR_WRITE; - break; + goto out; } } + ret = 0; out: close_wim_writable(w); memcpy(&w->hdr, &hdr_save, sizeof(struct wim_header));