X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fjoin.c;h=00fd292b7117f4dafe974fe7aacf09e328fbc12b;hp=94ce400b78bb4a41bb1705752b06172e36c0205b;hb=HEAD;hpb=de6ab524b0dece4d849483a302e620960eda2c52

diff --git a/src/join.c b/src/join.c
index 94ce400b..00fd292b 100644
--- a/src/join.c
+++ b/src/join.c
@@ -2,202 +2,142 @@
  * join.c
  *
  * Join split WIMs (sometimes named as .swm files) together into one WIM.
+ */
+
+/*
+ * Copyright (C) 2012-2016 Eric Biggers
  *
- * Copyright (C) 2012 Eric Biggers
- *
- * wimlib - Library for working with WIM files 
- *
- * This library is free software; you can redistribute it and/or modify it under
+ * This file 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
+ * 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.
+ * This file 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.
  *
- * 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 Lesser General Public License
+ * along with this file; if not, see https://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.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)
-{
-	uint i;
-	int ret;
-	FILE *out_fp = joined_wim->out_fp;
-	u64 total_bytes = wim_info_get_total_bytes(swms[0]->wim_info);
+#include <stdlib.h>
 
-	swms[0]->write_metadata = false;
-	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);
+#include "wimlib.h"
+#include "wimlib/error.h"
+#include "wimlib/types.h"
+#include "wimlib/util.h"
+#include "wimlib/wim.h"
+
+/*
+ * Verify that a list of WIM files sorted by part number is a spanned set.
+ *
+ * Return: 0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid.
+ */
+static int
+verify_swm_set(WIMStruct * const *swms, unsigned num_swms)
+{
+	for (unsigned i = 0; i < num_swms; i++) {
+		if (!guids_equal(swms[i]->hdr.guid, swms[0]->hdr.guid)) {
+			ERROR("The split WIM parts specified belong to "
+			      "different split WIMs!");
+			return WIMLIB_ERR_SPLIT_INVALID;
 		}
-		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;
+		if (swms[i]->hdr.total_parts != num_swms) {
+			ERROR("\"%"TS"\" says there are %u parts in the split "
+			      "WIM, but %s%u part%s provided",
+			      swms[i]->filename, swms[i]->hdr.total_parts,
+			      num_swms < swms[i]->hdr.total_parts ? "only ":"",
+			      num_swms, num_swms > 1 ? "s were" : " was");
+			return WIMLIB_ERR_SPLIT_INVALID;
 		}
-		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;
+		if (swms[i]->hdr.part_number != i + 1) {
+			ERROR("The parts of the split WIM are not numbered "
+			      "1..%u as expected.  Did you specify duplicate "
+			      "parts?", num_swms);
+			return WIMLIB_ERR_SPLIT_INVALID;
 		}
 	}
-	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;
-	}
-
-	off_t lookup_table_offset = ftello(out_fp);
-
-	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. */
-	for (i = 0; i < num_swms; i++) {
-		ret = write_lookup_table(swms[i]->lookup_table, out_fp);
-		if (ret != 0)
-			return ret;
-	}
-	off_t xml_data_offset = ftello(out_fp);
-
-	if (lookup_table_offset == -1 || xml_data_offset == -1) {
-		ERROR("Failed to get file offset: %m\n");
-		return WIMLIB_ERR_WRITE;
-	}
-	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;
+	return 0;
+}
 
+static int
+cmp_swms_by_part_number(const void *p1, const void *p2)
+{
+	WIMStruct *swm1 = *(WIMStruct **)p1;
+	WIMStruct *swm2 = *(WIMStruct **)p2;
 
-	/* 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);
+	return (int)swm1->hdr.part_number - (int)swm2->hdr.part_number;
 }
 
-
-WIMLIBAPI int wimlib_join(const char **swm_names, int num_swms, 
-			  const char *output_path, int flags)
+WIMLIBAPI int
+wimlib_join_with_progress(const tchar * const *swm_names,
+			  unsigned num_swms,
+			  const tchar *output_path,
+			  int swm_open_flags,
+			  int wim_write_flags,
+			  wimlib_progress_func_t progfunc,
+			  void *progctx)
 {
-	int i;
+	WIMStruct **swms;
+	unsigned 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;
-
-	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;
 
-	}
-	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;
+	swms = CALLOC(num_swms, sizeof(swms[0]));
+	if (!swms)
+		return WIMLIB_ERR_NOMEM;
 
-	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_with_progress(swm_names[i],
+						    swm_open_flags,
+						    &swms[i],
+						    progfunc,
+						    progctx);
+		if (ret)
+			goto out;
 	}
-	wimlib_free(joined_wim);
+
+	qsort(swms, num_swms, sizeof(swms[0]), cmp_swms_by_part_number);
+
+	ret = verify_swm_set(swms, num_swms);
+	if (ret)
+		goto out;
+
+	ret = wimlib_reference_resources(swms[0], swms + 1, num_swms - 1, 0);
+	if (ret)
+		goto out;
+
+	/* It is reasonably safe to provide WIMLIB_WRITE_FLAG_STREAMS_OK, as we
+	 * have verified that the specified split WIM parts form a spanned set.
+	 */
+	ret = wimlib_write(swms[0], output_path, WIMLIB_ALL_IMAGES,
+			   wim_write_flags |
+				WIMLIB_WRITE_FLAG_STREAMS_OK |
+				WIMLIB_WRITE_FLAG_RETAIN_GUID,
+			   1);
+out:
+	for (i = 0; i < num_swms; i++)
+		wimlib_free(swms[i]);
+	FREE(swms);
 	return ret;
 }
+
+/* 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)
+{
+	return wimlib_join_with_progress(swm_names, num_swms, output_path,
+					 swm_open_flags, wim_write_flags,
+					 NULL, NULL);
+}