*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
#include "xml.h"
#include <stdlib.h>
-static int move_lte_to_table(struct 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 lookup_table*)other_tab, lte);
+ lookup_table_insert((struct wim_lookup_table*)other_tab, lte);
return 0;
}
-static int lookup_table_join(struct lookup_table *table,
- struct 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);
-}
-
-/*
- * Sanity checks to make sure a set of WIMs correctly correspond to a spanned
- * set.
- *
- * @w:
- * Part 1 of the set.
- *
- * @additional_swms:
- * All parts of the set other than part 1.
- *
- * @num_additional_swms:
- * Number of WIMStructs in @additional_swms. Or, the total number of parts
- * in the set minus 1.
- *
- * @return:
- * 0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid.
- */
-int verify_swm_set(WIMStruct *w, WIMStruct **additional_swms,
- unsigned num_additional_swms)
-{
- unsigned total_parts = w->hdr.total_parts;
- int ctype;
- const u8 *guid;
-
- if (total_parts != num_additional_swms + 1) {
- ERROR("`%s' says there are %u parts in the spanned set, "
- "but %s%u part%s provided",
- w->filename, total_parts,
- (num_additional_swms + 1 < total_parts) ? "only " : "",
- num_additional_swms + 1,
- (num_additional_swms) ? "s were" : " was");
- return WIMLIB_ERR_SPLIT_INVALID;
- }
- if (w->hdr.part_number != 1) {
- ERROR("WIM `%s' is not the first part of the split WIM.",
- w->filename);
- return WIMLIB_ERR_SPLIT_INVALID;
- }
- for (unsigned i = 0; i < num_additional_swms; i++) {
- if (additional_swms[i]->hdr.total_parts != total_parts) {
- ERROR("WIM `%s' says there are %u parts in the spanned set, "
- "but %u parts were provided",
- additional_swms[i]->filename,
- additional_swms[i]->hdr.total_parts,
- total_parts);
- return WIMLIB_ERR_SPLIT_INVALID;
- }
- }
-
- /* keep track of ctype and guid just to make sure they are the same for
- * all the WIMs. */
- ctype = wimlib_get_compression_type(w);
- guid = w->hdr.guid;
-
- WIMStruct *parts_to_swms[num_additional_swms];
- ZERO_ARRAY(parts_to_swms);
- for (unsigned i = 0; i < num_additional_swms; i++) {
-
- WIMStruct *swm = additional_swms[i];
-
- if (wimlib_get_compression_type(swm) != ctype) {
- ERROR("The split WIMs do not all have the same "
- "compression type");
- return WIMLIB_ERR_SPLIT_INVALID;
- }
- if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) {
- ERROR("The split WIMs do not all have the same "
- "GUID");
- return WIMLIB_ERR_SPLIT_INVALID;
- }
- if (swm->hdr.part_number == 1) {
- ERROR("WIMs `%s' and `%s' both are marked as the "
- "first WIM in the spanned set",
- w->filename, swm->filename);
- return WIMLIB_ERR_SPLIT_INVALID;
- }
- if (swm->hdr.part_number == 0 ||
- swm->hdr.part_number > total_parts)
- {
- ERROR("WIM `%s' says it is part %u in the spanned set, "
- "but the part number must be in the range "
- "[1, %u]",
- swm->filename, swm->hdr.part_number, total_parts);
- return WIMLIB_ERR_SPLIT_INVALID;
- }
- if (parts_to_swms[swm->hdr.part_number - 2])
- {
- ERROR("`%s' and `%s' are both marked as part %u of %u "
- "in the spanned set",
- parts_to_swms[swm->hdr.part_number - 2]->filename,
- swm->filename,
- swm->hdr.part_number,
- total_parts);
- return WIMLIB_ERR_SPLIT_INVALID;
- } else {
- parts_to_swms[swm->hdr.part_number - 2] = swm;
- }
- }
+ for_lookup_table_entry(new, move_lte_to_table, table);
+ new->num_entries = 0;
return 0;
}
/*
- * Joins lookup tables from the parts of a split WIM.
+ * 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.
* 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).
+ * 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 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 lookup_table *table;
+ struct wim_lookup_table *table;
int ret;
unsigned i;
}
-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;
}
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");
- 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;
+ 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;
- fclose(swms[i]->fp);
- swms[i]->fp = NULL;
- if (ret != 0)
+ 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)
return ret;
if (progress_func) {
}
}
+ /* 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;
/*
* 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)
+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;
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