X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fjoin.c;h=3500654168671247318c0f866f18e0967d5aebf0;hp=b8827773d11f26842d79dcc281eeb478f1c9674b;hb=2200ddb2ab85b390daa140de5338ac9f023d3683;hpb=4f9947253f6a08f4a922d3efe0880e3039b3eb5e

diff --git a/src/join.c b/src/join.c
index b8827773..35006541 100644
--- a/src/join.c
+++ b/src/join.c
@@ -2,202 +2,175 @@
  * join.c
  *
  * Join split WIMs (sometimes named as .swm files) together into one WIM.
+ */
+
+/*
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
- * Copyright (C) 2012 Eric Biggers
- *
- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.
  *
- * This library 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 2.1 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.
  *
- * This library 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.
+ * 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
+ * details.
  *
- * You should have received a copy of the GNU Lesser General Public License along
- * with this library; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place, Suite 330, Boston, MA 02111-1307 USA 
+ * You should have received a copy of the GNU General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib.h"
-#include "lookup_table.h"
-#include "xml.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
-static int join_wims(WIMStruct **swms, uint num_swms, WIMStruct *joined_wim,
-		     int write_flags)
+#include "wimlib.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/resource.h"
+#include "wimlib/swm.h"
+#include "wimlib/write.h"
+#include "wimlib/xml.h"
+
+#include <stdlib.h> /* for qsort() */
+
+static int
+join_wims(WIMStruct **swms, unsigned num_swms,
+	  WIMStruct *joined_wim, int write_flags,
+	  wimlib_progress_func_t progress_func)
 {
-	uint i;
 	int ret;
-	FILE *out_fp = joined_wim->out_fp;
-	u64 total_bytes = wim_info_get_total_bytes(swms[0]->wim_info);
+	unsigned i;
+	union wimlib_progress_info progress;
+	u64 total_bytes = 0;
+	u64 part_bytes;
+	u64 swm_part_sizes[num_swms];
 
-	swms[0]->write_metadata = false;
+	/* Calculate total size of the streams in the split WIM parts. */
 	for (i = 0; i < num_swms; i++) {
-		if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS) {
-			off_t cur_offset = ftello(out_fp);
-			printf("Writing resources from part %u of %u "
-					"(%"PRIu64" of %"PRIu64" bytes, %.0f%% done)\n",
-					i + 1, num_swms,
-					cur_offset, total_bytes,
-					(double)cur_offset / total_bytes * 100.0);
-		}
-		swms[i]->fp = fopen(swms[i]->filename, "rb");
-		if (!swms[i]->fp) {
-			ERROR("Failed to reopen `%s': %m\n", swms[i]->filename);
-			return WIMLIB_ERR_OPEN;
-		}
-		swms[i]->out_fp = out_fp;
-		swms[i]->hdr.part_number = 1;
-		ret = for_lookup_table_entry(swms[i]->lookup_table, 
-					     copy_resource, swms[i]);
-		if (ret != 0)
-			return ret;
-		if (i != 0) {
-			fclose(swms[i]->fp);
-			swms[i]->fp = NULL;
-		}
-	}
-	swms[0]->write_metadata = true;
-	if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS)
-		printf("Writing %d metadata resources\n", 
-			swms[0]->hdr.image_count);
-
-	for (i = 0; i < swms[0]->hdr.image_count; i++) {
-		ret = copy_resource(swms[0]->image_metadata[i].lookup_table_entry, 
-				    swms[0]);
-		if (ret != 0)
-			return ret;
+		part_bytes = lookup_table_total_stream_size(swms[i]->lookup_table);
+		swm_part_sizes[i] = part_bytes;
+		total_bytes += part_bytes;
 	}
 
-	off_t lookup_table_offset = ftello(out_fp);
+	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);
+	}
 
-	if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS)
-		printf("Writing lookup tables, XML data, and header\n");
-	/* Now write the lookup table for the joined wim.  Since the lookup
-	 * table has no header, we can just concatenate the lookup tables of all
-	 * the SWM parts. */
+	/* Write the non-metadata resources from each SWM part */
 	for (i = 0; i < num_swms; i++) {
-		ret = write_lookup_table(swms[i]->lookup_table, out_fp);
-		if (ret != 0)
+		ret = reopen_wim(swms[i]);
+		if (ret)
 			return ret;
-	}
-	off_t xml_data_offset = ftello(out_fp);
+		swms[i]->out_fd = joined_wim->out_fd;
+		swms[i]->hdr.part_number = 1;
 
-	if (lookup_table_offset == -1 || xml_data_offset == -1) {
-		ERROR("Failed to get file offset: %m\n");
-		return WIMLIB_ERR_WRITE;
+		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) {
+			progress.join.completed_bytes += swm_part_sizes[i];
+			progress.join.completed_parts++;
+			progress_func(WIMLIB_PROGRESS_MSG_JOIN_STREAMS, &progress);
+		}
 	}
-	swms[0]->hdr.lookup_table_res_entry.offset = lookup_table_offset;
-	swms[0]->hdr.lookup_table_res_entry.size = 
-					xml_data_offset - lookup_table_offset;
 
+	/* 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;
+	}
 
-	/* finish_write is called on the first swm, not the joined_wim, because
-	 * the first swm is the one that has the image metadata and XML data
-	 * attached to it.  */
-	swms[0]->hdr.flags &= ~WIM_HDR_FLAG_SPANNED;
-	swms[0]->hdr.total_parts = 1;
-	return finish_write(swms[0], WIM_ALL_IMAGES, write_flags, 0);
+	/* Write lookup table, XML data, and optional integrity table */
+	merge_lookup_tables(joined_wim, swms, num_swms);
+	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)
+{
+	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;
+}
 
-WIMLIBAPI int wimlib_join(const char **swm_names, int num_swms, 
-			  const char *output_path, int flags)
+/*
+ * Join a set of split WIMs into a stand-alone WIM.
+ */
+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 i;
 	int ret;
-	int part_idx;
-	int write_flags = 0;
-	WIMStruct *w;
 	WIMStruct *joined_wim = NULL;
-	WIMStruct *swms[num_swms];
-
-	/* keep track of ctype and guid just to make sure they are the same for
-	 * all the WIMs. */
-	int ctype;
-	u8 *guid;
+	unsigned i;
 
-	ZERO_ARRAY(swms);
-	for (i = 0; i < num_swms; i++) {
-		ret = wimlib_open_wim(swm_names[i], 
-				      flags | WIMLIB_OPEN_FLAG_SPLIT_OK, &w);
-		if (ret != 0)
-			goto err;
-
-		/* don't open all the parts at the same time, in case there are
-		 * a lot af them */
-		fclose(w->fp);
-		w->fp = NULL;
-
-		if (i == 0) {
-			ctype = wimlib_get_compression_type(w);
-			guid = w->hdr.guid;
-		} else {
-			if (wimlib_get_compression_type(w) != ctype) {
-				ERROR("The split WIMs do not all have the same "
-						"compression type!\n");
-				ret = WIMLIB_ERR_SPLIT_INVALID;
-				goto err;
-			}
-			if (memcmp(guid, w->hdr.guid, WIM_GID_LEN) != 0) {
-				ERROR("The split WIMs do not all have the "
-						"same GUID!\n");
-				ret = WIMLIB_ERR_SPLIT_INVALID;
-				goto err;
-			}
-		}
-		if (w->hdr.total_parts != num_swms) {
-			ERROR("`%s' (part %d) says there are %d total parts, "
-					"but %d parts were specified!\n",
-					swm_names[i], w->hdr.part_number,
-					w->hdr.total_parts, num_swms);
-			ret = WIMLIB_ERR_SPLIT_INVALID;
-			goto err;
-		}
-		if (w->hdr.part_number == 0 || w->hdr.part_number > num_swms) {
-			ERROR("`%s' says it is part %d, but expected a number\n"
-					"between 1 and %d!\n",
-				swm_names[i], w->hdr.part_number, num_swms);
-			ret = WIMLIB_ERR_SPLIT_INVALID;
-			goto err;
-		}
-		part_idx = w->hdr.part_number - 1;
-		if (swms[part_idx] != NULL) {
-			ERROR("`%s' and `%s' both say they are part %d of %d!\n",
-				swm_names[i], swms[part_idx]->filename,
-				w->hdr.part_number, num_swms);
-			ret = WIMLIB_ERR_SPLIT_INVALID;
-			goto err;
-		}
-		swms[part_idx] = w;
+	swm_open_flags |= WIMLIB_OPEN_FLAG_SPLIT_OK;
+	wim_write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
 
-	}
-	joined_wim = new_wim_struct();
-	if (!joined_wim) {
-		ret = WIMLIB_ERR_NOMEM;
-		goto err;
-	}
+	if (num_swms < 1 || num_swms > 0xffff)
+		return WIMLIB_ERR_INVALID_PARAM;
 
-	if (flags & WIMLIB_OPEN_FLAG_CHECK_INTEGRITY)
-		write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
-	if (flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
-		write_flags |= WIMLIB_WRITE_FLAG_SHOW_PROGRESS;
+	WIMStruct *swms[num_swms];
+	ZERO_ARRAY(swms);
 
-	ret = begin_write(joined_wim, output_path, write_flags);
-	if (ret != 0)
-		goto err;
-	ret = join_wims(swms, num_swms, joined_wim, write_flags);
-err:
 	for (i = 0; i < num_swms; i++) {
-		/* out_fp is the same in all the swms and joined_wim; only close
-		 * it one time, when freeing joined_wim. */
-		if (swms[i]) {
-			swms[i]->out_fp = NULL;
-			wimlib_free(swms[i]);
-		}
+		ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swms[i],
+				      progress_func);
+		if (ret)
+			goto out_free_wims;
+
+		/* Don't open all the parts at the same time, in case there are
+		 * a lot of them */
+		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)
+		goto out_free_wims;
+
+	ret = wimlib_create_new_wim(wimlib_get_compression_type(swms[0]),
+				    &joined_wim);
+	if (ret)
+		goto out_free_wims;
+
+	ret = begin_write(joined_wim, output_path, wim_write_flags);
+	if (ret)
+		goto out_free_wims;
+	ret = join_wims(swms, num_swms, joined_wim, wim_write_flags,
+			progress_func);
+out_free_wims:
+	for (i = 0; i < num_swms; i++)
+		wimlib_free(swms[i]);
 	wimlib_free(joined_wim);
 	return ret;
 }