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;
}
/*
}
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;
if (i != 0) {
swms[i]->fp = NULL;
}
- 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;