X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=27e7a02c473d877aa51999e20004b4b83183cfd7;hb=88afc46984c143cbf928a3186f8cc93d819e9269;hp=f6b8d2ca882eb96ebcb872b0618f64cf70065ac9;hpb=1530b6dab02a9e1e5faf81529ab502aee68d8cd2;p=wimlib diff --git a/src/join.c b/src/join.c index f6b8d2ca..27e7a02c 100644 --- a/src/join.c +++ b/src/join.c @@ -5,210 +5,139 @@ */ /* - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012-2016 Eric Biggers * - * This file is part of wimlib, a library for working with WIM files. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at your option) - * any later version. - * - * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. * - * You should have received a copy of the GNU General Public License - * along with wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU Lesser General Public License + * along with this file; if not, see http://www.gnu.org/licenses/. */ -#include "wimlib_internal.h" -#include "lookup_table.h" -#include "xml.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -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) -{ - return for_lookup_table_entry(new, move_lte_to_table, table); -} +#include "wimlib.h" +#include "wimlib/error.h" +#include "wimlib/types.h" +#include "wimlib/util.h" +#include "wimlib/wim.h" /* - * new_joined_lookup_table: - Join lookup tables from the parts of a split WIM. - * - * @w specifies the first part, while @additional_swms and @num_additional_swms - * specify an array of pointers to the WIMStruct's for additional split WIM parts. - * - * The lookup table entries are *moved* to the new table. + * Verify that a list of WIM files sorted by part number is a spanned set. * - * On success, 0 is returned on a pointer to the joined lookup table is returned - * in @table_ret. - * - * 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. + * Return: 0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid. */ -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; - unsigned i; - - table = new_lookup_table(9001); - if (!table) - return WIMLIB_ERR_NOMEM; - - if (w) - lookup_table_join(table, w->lookup_table); - - for (i = 0; i < num_additional_swms; i++) { - ret = lookup_table_join(table, additional_swms[i]->lookup_table); - if (ret != 0) - goto out_free_table; - } - *table_ret = table; - return 0; -out_free_table: - free_lookup_table(table); - return ret; -} - - -static int join_wims(WIMStruct **swms, unsigned num_swms, - WIMStruct *joined_wim, int write_flags, - wimlib_progress_func_t progress_func) +static int +verify_swm_set(WIMStruct * const *swms, unsigned num_swms) { - int ret; - unsigned i; - union wimlib_progress_info progress; - u64 total_bytes = 0; - u64 part_bytes; - u64 swm_part_sizes[num_swms]; - - /* Calculate total size of the streams in the split WIM parts. */ - for (i = 0; i < num_swms; i++) { - part_bytes = lookup_table_total_stream_size(swms[i]->lookup_table); - swm_part_sizes[i] = part_bytes; - total_bytes += part_bytes; - } - - 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_func(WIMLIB_PROGRESS_MSG_JOIN_STREAMS, &progress); - } - - /* Write the resources (streams and metadata resources) from each SWM - * part */ - swms[0]->write_metadata = true; - for (i = 0; i < num_swms; i++) { - swms[i]->fp = fopen(swms[i]->filename, "rb"); - if (!swms[i]->fp) { - ERROR_WITH_ERRNO("Failed to reopen `%s'", - swms[i]->filename); - return WIMLIB_ERR_OPEN; + for (unsigned i = 0; i < num_swms; i++) { + if (!guids_equal(swms[i]->hdr.guid, swms[0]->hdr.guid)) { + ERROR("The split WIM parts specified belong to " + "different split WIMs!"); + return WIMLIB_ERR_SPLIT_INVALID; } - 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]); - swms[i]->out_fp = NULL; - fclose(swms[i]->fp); - swms[i]->fp = NULL; - - if (ret != 0) - return ret; - - if (progress_func) { - progress.join.completed_bytes += swm_part_sizes[i]; - progress.join.completed_parts++; - progress_func(WIMLIB_PROGRESS_MSG_JOIN_STREAMS, &progress); + if (swms[i]->hdr.total_parts != num_swms) { + ERROR("\"%"TS"\" says there are %u parts in the split " + "WIM, but %s%u part%s provided", + swms[i]->filename, swms[i]->hdr.total_parts, + num_swms < swms[i]->hdr.total_parts ? "only ":"", + num_swms, num_swms > 1 ? "s were" : " was"); + return WIMLIB_ERR_SPLIT_INVALID; + } + if (swms[i]->hdr.part_number != i + 1) { + ERROR("The parts of the split WIM are not numbered " + "1..%u as expected. Did you specify duplicate " + "parts?", num_swms); + return WIMLIB_ERR_SPLIT_INVALID; } } - - joined_wim->hdr.image_count = swms[0]->hdr.image_count; - 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; - ret = finish_write(joined_wim, WIMLIB_ALL_IMAGES, write_flags, progress_func); - joined_wim->wim_info = NULL; - return ret; + return 0; } -static int cmp_swms_by_part_number(const void *swm1, const void *swm2) +static int +cmp_swms_by_part_number(const void *p1, const void *p2) { - u16 partno_1 = (*(const WIMStruct**)swm1)->hdr.part_number; - u16 partno_2 = (*(const WIMStruct**)swm2)->hdr.part_number; - return (int)partno_1 - (int)partno_2; + WIMStruct *swm1 = *(WIMStruct **)p1; + WIMStruct *swm2 = *(WIMStruct **)p2; + + return (int)swm1->hdr.part_number - (int)swm2->hdr.part_number; } -/* - * Join a set of split WIMs into a stand-alone WIM. - */ -WIMLIBAPI int wimlib_join(const char **swm_names, unsigned num_swms, - const char *output_path, int swm_open_flags, +WIMLIBAPI int +wimlib_join_with_progress(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) + wimlib_progress_func_t progfunc, + void *progctx) { - int ret; - WIMStruct *joined_wim = NULL; + WIMStruct **swms; unsigned i; - - swm_open_flags |= WIMLIB_OPEN_FLAG_SPLIT_OK; - wim_write_flags &= WIMLIB_WRITE_MASK_PUBLIC; + int ret; if (num_swms < 1 || num_swms > 0xffff) return WIMLIB_ERR_INVALID_PARAM; - WIMStruct *swms[num_swms]; - ZERO_ARRAY(swms); + swms = CALLOC(num_swms, sizeof(swms[0])); + if (!swms) + return WIMLIB_ERR_NOMEM; for (i = 0; i < num_swms; i++) { - ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swms[i], - progress_func); - if (ret != 0) + ret = wimlib_open_wim_with_progress(swm_names[i], + swm_open_flags, + &swms[i], + progfunc, + progctx); + if (ret) goto out; - - /* Don't open all the parts at the same time, in case there are - * a lot of them */ - fclose(swms[i]->fp); - swms[i]->fp = NULL; } 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) + ret = verify_swm_set(swms, num_swms); + if (ret) goto out; - ret = wimlib_create_new_wim(wimlib_get_compression_type(swms[0]), - &joined_wim); - if (ret != 0) + ret = wimlib_reference_resources(swms[0], swms + 1, num_swms - 1, 0); + if (ret) goto out; - ret = begin_write(joined_wim, output_path, wim_write_flags); - if (ret != 0) - goto out; - ret = join_wims(swms, num_swms, joined_wim, wim_write_flags, - progress_func); + /* It is reasonably safe to provide WIMLIB_WRITE_FLAG_STREAMS_OK, as we + * have verified that the specified split WIM parts form a spanned set. + */ + ret = wimlib_write(swms[0], output_path, WIMLIB_ALL_IMAGES, + wim_write_flags | + WIMLIB_WRITE_FLAG_STREAMS_OK | + WIMLIB_WRITE_FLAG_RETAIN_GUID, + 1); out: for (i = 0; i < num_swms; i++) wimlib_free(swms[i]); - wimlib_free(joined_wim); + FREE(swms); return ret; } + +/* API function documented in wimlib.h */ +WIMLIBAPI int +wimlib_join(const tchar * const *swm_names, + unsigned num_swms, + const tchar *output_path, + int swm_open_flags, + int wim_write_flags) +{ + return wimlib_join_with_progress(swm_names, num_swms, output_path, + swm_open_flags, wim_write_flags, + NULL, NULL); +}