*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
-#include "wimlib_internal.h"
-#include "lookup_table.h"
-#include "xml.h"
-#include <stdlib.h>
-
-static int move_lte_to_table(struct lookup_table_entry *lte,
- void *other_tab)
-{
- hlist_del(<e->hash_list);
- lookup_table_insert((struct lookup_table*)other_tab, lte);
- return 0;
-}
-
-static int lookup_table_join(struct lookup_table *table,
- struct lookup_table *new)
-{
- return for_lookup_table_entry(new, move_lte_to_table, table);
-}
-
-/*
- * Joins 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.
- *
- * 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 split WIM.
- * - Each lookup table entry will have a pointer to its split WIM part (and
- * a part number field, although we don't really use it).
- */
-int new_joined_lookup_table(WIMStruct *w,
- WIMStruct **additional_swms,
- unsigned num_additional_swms,
- struct lookup_table **table_ret)
-{
- struct 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)
-{
- 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;
- }
- 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);
- }
- }
-
- 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;
-}
-
-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;
- return (int)partno_1 - (int)partno_2;
-}
-
-/*
- * 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,
- int wim_write_flags,
- wimlib_progress_func_t progress_func)
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/types.h"
+#include "wimlib/util.h"
+#include "wimlib/wim.h"
+
+/* 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,
+ wimlib_progress_func_t progress_func)
{
int ret;
- WIMStruct *joined_wim = NULL;
unsigned i;
+ unsigned j;
+ WIMStruct *swm0;
+ WIMStruct **swms;
+ unsigned num_additional_swms;
+ WIMStruct *wim;
swm_open_flags |= WIMLIB_OPEN_FLAG_SPLIT_OK;
- wim_write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
if (num_swms < 1 || num_swms > 0xffff)
return WIMLIB_ERR_INVALID_PARAM;
+ num_additional_swms = num_swms - 1;
- WIMStruct *swms[num_swms];
- ZERO_ARRAY(swms);
+ swms = CALLOC(num_additional_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)
- goto out;
+ swm0 = NULL;
+ for (i = 0, j = 0; i < num_swms; i++) {
+ WIMStruct *swm;
- /* 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;
+ ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swm,
+ progress_func);
+ if (ret)
+ goto out_free_swms;
+ if (swm->hdr.part_number == 1 && swm0 == NULL)
+ swm0 = swm;
+ else
+ swms[j++] = swm;
}
- qsort(swms, num_swms, sizeof(swms[0]), cmp_swms_by_part_number);
+ if (!swm0) {
+ ret = WIMLIB_ERR_SPLIT_INVALID;
+ goto out_free_swms;
+ }
- ret = verify_swm_set(swms[0], &swms[1], num_swms - 1);
- if (ret != 0)
- goto out;
+ ret = wimlib_create_new_wim(swm0->compression_type, &wim);
+ if (ret)
+ goto out_free_swms;
+
+ ret = wimlib_export_image(swm0, WIMLIB_ALL_IMAGES,
+ wim, NULL, NULL, 0,
+ swms, num_additional_swms,
+ progress_func);
+ if (ret)
+ goto out_free_wim;
+
+ wim->hdr.flags |= swm0->hdr.flags & (WIM_HDR_FLAG_RP_FIX |
+ WIM_HDR_FLAG_READONLY);
+ if (!(wim_write_flags & (WIMLIB_WRITE_FLAG_CHECK_INTEGRITY |
+ WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY)))
+ {
+ if (wim_has_integrity_table(swm0))
+ wim_write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
+ }
+ if (!(wim_write_flags & (WIMLIB_WRITE_FLAG_PIPABLE |
+ WIMLIB_WRITE_FLAG_NOT_PIPABLE)))
+ {
+ if (wim_is_pipable(swm0))
+ wim_write_flags |= WIMLIB_WRITE_FLAG_PIPABLE;
+ }
- ret = wimlib_create_new_wim(wimlib_get_compression_type(swms[0]),
- &joined_wim);
- if (ret != 0)
- 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);
-out:
- for (i = 0; i < num_swms; i++)
+ ret = wimlib_write(wim, output_path, WIMLIB_ALL_IMAGES,
+ wim_write_flags, 1, progress_func);
+out_free_wim:
+ wimlib_free(wim);
+out_free_swms:
+ for (i = 0; i < num_additional_swms; i++)
wimlib_free(swms[i]);
- wimlib_free(joined_wim);
+ FREE(swms);
+ wimlib_free(swm0);
return ret;
}
git://wimlib.net / wimlib / blobdiff