#include <stdlib.h>
static int
-move_lte_to_table(struct wim_lookup_table_entry *lte, void *other_tab)
+move_lte_to_table(struct wim_lookup_table_entry *lte, void *combined_table)
{
hlist_del(<e->hash_list);
- lookup_table_insert((struct wim_lookup_table*)other_tab, lte);
+ lookup_table_insert((struct wim_lookup_table*)combined_table, lte);
return 0;
}
-static int
-lookup_table_join(struct wim_lookup_table *table,
- struct wim_lookup_table *new)
+static void
+lookup_table_join(struct wim_lookup_table *combined_table,
+ struct wim_lookup_table *part_table)
{
- return for_lookup_table_entry(new, move_lte_to_table, table);
+ for_lookup_table_entry(part_table, move_lte_to_table, combined_table);
+ part_table->num_entries = 0;
}
/*
- * new_joined_lookup_table: - Join lookup tables from the parts of a split WIM.
+ * merge_lookup_tables() - Merge 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 WIM.
*/
-int
-new_joined_lookup_table(WIMStruct *w,
- WIMStruct **additional_swms,
- unsigned num_additional_swms,
- struct wim_lookup_table **table_ret)
+void
+merge_lookup_tables(WIMStruct *w,
+ WIMStruct **additional_swms,
+ unsigned num_additional_swms)
{
- 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 (unsigned i = 0; i < num_additional_swms; i++)
+ lookup_table_join(w->lookup_table, additional_swms[i]->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;
+static int
+move_lte_to_orig_table(struct wim_lookup_table_entry *lte, void *_wim)
+{
+ WIMStruct *wim = _wim;
+ if (lte->wim != wim) {
+ move_lte_to_table(lte, lte->wim->lookup_table);
+ wim->lookup_table->num_entries--;
}
- *table_ret = table;
return 0;
-out_free_table:
- free_lookup_table(table);
- return ret;
+}
+
+/* Undo merge_lookup_tables(), given the first WIM part that contains the merged
+ * lookup table. */
+void
+unmerge_lookup_table(WIMStruct *wim)
+{
+ for_lookup_table_entry(wim->lookup_table, move_lte_to_orig_table, wim);
}
}
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 non-metadata resources from each SWM part */
for (i = 0; i < num_swms; i++) {
- swms[i]->fp = tfopen(swms[i]->filename, T("rb"));
- if (!swms[i]->fp) {
- ERROR_WITH_ERRNO("Failed to reopen `%"TS"'",
- swms[i]->filename);
- return WIMLIB_ERR_OPEN;
- }
- swms[i]->out_fp = joined_wim->out_fp;
+ ret = reopen_wim(swms[i]);
+ if (ret)
+ return ret;
+ swms[i]->out_fd = joined_wim->out_fd;
swms[i]->hdr.part_number = 1;
- ret = for_lookup_table_entry(swms[i]->lookup_table,
- copy_resource, swms[i]);
- swms[i]->out_fp = NULL;
- if (i != 0) {
- fclose(swms[i]->fp);
- swms[i]->fp = NULL;
- }
+ ret = for_lookup_table_entry_pos_sorted(swms[i]->lookup_table,
+ copy_resource,
+ swms[i]);
+ swms[i]->out_fd = -1;
+ if (i != 0)
+ close_wim(swms[i]);
- if (ret != 0)
+ if (ret)
return ret;
if (progress_func) {
}
}
- /* Write metadata resources from the first SWM part */
- swms[0]->out_fp = joined_wim->out_fp;
- ret = for_image(swms[0], WIMLIB_ALL_IMAGES, write_metadata_resource);
- swms[0]->out_fp = NULL;
- fclose(swms[0]->fp);
- swms[0]->fp = NULL;
-
- if (ret)
- return ret;
+ /* 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 */
- 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);
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 */
- fclose(swms[i]->fp);
- swms[i]->fp = NULL;
+ close_wim(swms[i]);
}
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);
git://wimlib.net / wimlib / blobdiff