X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=b5c7c37bb576c202ae108227f80441640fa4599a;hb=2af95e7dc313e9abaf571034c3e86f32503bf232;hp=4d059050537c071e4813ee94732a5dc90f74f20a;hpb=86e0ea554928890970618ff353bec09bf33708a8;p=wimlib diff --git a/src/join.c b/src/join.c index 4d059050..b5c7c37b 100644 --- a/src/join.c +++ b/src/join.c @@ -28,18 +28,21 @@ #include "xml.h" #include -static int move_lte_to_table(struct wim_lookup_table_entry *lte, - void *other_tab) +static int +move_lte_to_table(struct wim_lookup_table_entry *lte, void *other_tab) { hlist_del(<e->hash_list); lookup_table_insert((struct wim_lookup_table*)other_tab, lte); return 0; } -static int lookup_table_join(struct wim_lookup_table *table, - struct wim_lookup_table *new) +static int +lookup_table_join(struct wim_lookup_table *table, + struct wim_lookup_table *new) { - return for_lookup_table_entry(new, move_lte_to_table, table); + for_lookup_table_entry(new, move_lte_to_table, table); + new->num_entries = 0; + return 0; } /* @@ -56,10 +59,11 @@ static int lookup_table_join(struct wim_lookup_table *table, * The reason we join the lookup tables is so we only have to search one lookup * table to find the location of a resource in the entire WIM. */ -int new_joined_lookup_table(WIMStruct *w, - WIMStruct **additional_swms, - unsigned num_additional_swms, - struct wim_lookup_table **table_ret) +int +new_joined_lookup_table(WIMStruct *w, + WIMStruct **additional_swms, + unsigned num_additional_swms, + struct wim_lookup_table **table_ret) { struct wim_lookup_table *table; int ret; @@ -85,9 +89,10 @@ out_free_table: } -static int join_wims(WIMStruct **swms, unsigned num_swms, - WIMStruct *joined_wim, int write_flags, - wimlib_progress_func_t progress_func) +static int +join_wims(WIMStruct **swms, unsigned num_swms, + WIMStruct *joined_wim, int write_flags, + wimlib_progress_func_t progress_func) { int ret; unsigned i; @@ -104,32 +109,35 @@ static int join_wims(WIMStruct **swms, unsigned num_swms, } if (progress_func) { - progress.join.total_bytes = total_bytes; - progress.join.total_parts = swms[0]->hdr.total_parts; - progress.join.completed_bytes = 0; - progress.join.completed_parts = 0; + progress.join.total_bytes = total_bytes; + progress.join.total_parts = swms[0]->hdr.total_parts; + progress.join.completed_bytes = 0; + progress.join.completed_parts = 0; progress_func(WIMLIB_PROGRESS_MSG_JOIN_STREAMS, &progress); } - /* Write the resources (streams and metadata resources) from each SWM - * part */ - swms[0]->write_metadata = true; + /* Write the non-metadata resources from each SWM part */ for (i = 0; i < num_swms; i++) { - swms[i]->fp = fopen(swms[i]->filename, "rb"); + swms[i]->fp = tfopen(swms[i]->filename, T("rb")); if (!swms[i]->fp) { - ERROR_WITH_ERRNO("Failed to reopen `%s'", + ERROR_WITH_ERRNO("Failed to reopen `%"TS"'", swms[i]->filename); return WIMLIB_ERR_OPEN; } swms[i]->out_fp = joined_wim->out_fp; swms[i]->hdr.part_number = 1; - ret = for_lookup_table_entry(swms[i]->lookup_table, - copy_resource, swms[i]); + + ret = for_lookup_table_entry_pos_sorted(swms[i]->lookup_table, + copy_resource, + swms[i]); swms[i]->out_fp = NULL; - fclose(swms[i]->fp); - swms[i]->fp = NULL; - if (ret != 0) + if (i != 0) { + fclose(swms[i]->fp); + swms[i]->fp = NULL; + } + + if (ret) return ret; if (progress_func) { @@ -139,18 +147,30 @@ static int join_wims(WIMStruct **swms, unsigned num_swms, } } + /* Copy the metadata resources from the first SWM part */ joined_wim->hdr.image_count = swms[0]->hdr.image_count; + for (i = 0; i < joined_wim->hdr.image_count; i++) { + ret = copy_resource(swms[0]->image_metadata[i]->metadata_lte, + joined_wim); + if (ret) + return ret; + } + + /* Write lookup table, XML data, and optional integrity table */ for (i = 0; i < num_swms; i++) lookup_table_join(joined_wim->lookup_table, swms[i]->lookup_table); free_wim_info(joined_wim->wim_info); joined_wim->wim_info = swms[0]->wim_info; + joined_wim->image_metadata = swms[0]->image_metadata; ret = finish_write(joined_wim, WIMLIB_ALL_IMAGES, write_flags, progress_func); joined_wim->wim_info = NULL; + joined_wim->image_metadata = NULL; return ret; } -static int cmp_swms_by_part_number(const void *swm1, const void *swm2) +static int +cmp_swms_by_part_number(const void *swm1, const void *swm2) { u16 partno_1 = (*(const WIMStruct**)swm1)->hdr.part_number; u16 partno_2 = (*(const WIMStruct**)swm2)->hdr.part_number; @@ -160,10 +180,13 @@ static int cmp_swms_by_part_number(const void *swm1, const void *swm2) /* * Join a set of split WIMs into a stand-alone WIM. */ -WIMLIBAPI int wimlib_join(const char * const *swm_names, unsigned num_swms, - const char *output_path, int swm_open_flags, - int wim_write_flags, - wimlib_progress_func_t progress_func) +WIMLIBAPI int +wimlib_join(const tchar * const *swm_names, + unsigned num_swms, + const tchar *output_path, + int swm_open_flags, + int wim_write_flags, + wimlib_progress_func_t progress_func) { int ret; WIMStruct *joined_wim = NULL; @@ -181,8 +204,8 @@ WIMLIBAPI int wimlib_join(const char * const *swm_names, unsigned num_swms, for (i = 0; i < num_swms; i++) { ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swms[i], progress_func); - if (ret != 0) - goto out; + if (ret) + goto out_free_wims; /* Don't open all the parts at the same time, in case there are * a lot of them */ @@ -193,20 +216,20 @@ WIMLIBAPI int wimlib_join(const char * const *swm_names, unsigned num_swms, qsort(swms, num_swms, sizeof(swms[0]), cmp_swms_by_part_number); ret = verify_swm_set(swms[0], &swms[1], num_swms - 1); - if (ret != 0) - goto out; + if (ret) + goto out_free_wims; ret = wimlib_create_new_wim(wimlib_get_compression_type(swms[0]), &joined_wim); - if (ret != 0) - goto out; + if (ret) + goto out_free_wims; ret = begin_write(joined_wim, output_path, wim_write_flags); - if (ret != 0) - goto out; + if (ret) + goto out_free_wims; ret = join_wims(swms, num_swms, joined_wim, wim_write_flags, progress_func); -out: +out_free_wims: for (i = 0; i < num_swms; i++) wimlib_free(swms[i]); wimlib_free(joined_wim);