X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=27e7a02c473d877aa51999e20004b4b83183cfd7;hb=e8da56fa0465b6ee714581fe828e22fd63bf3f8b;hp=d606b7be6392a71cd20241f11845b91d75f9909b;hpb=b348831df3fcf7d8eb66d35e4d0cf8434e788473;p=wimlib

diff --git a/src/join.c b/src/join.c
index d606b7be..27e7a02c 100644
--- a/src/join.c
+++ b/src/join.c
@@ -5,112 +5,139 @@
  */
 
 /*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012-2016 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * 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 3 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.
- *
- * 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
+ * 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 General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+
 #include "wimlib.h"
+#include "wimlib/error.h"
 #include "wimlib/types.h"
 #include "wimlib/util.h"
 #include "wimlib/wim.h"
 
-/* API function documented in wimlib.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;
+		}
+		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;
+		}
+		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;
+		}
+	}
+	return 0;
+}
+
+static int
+cmp_swms_by_part_number(const void *p1, const void *p2)
+{
+	WIMStruct *swm1 = *(WIMStruct **)p1;
+	WIMStruct *swm2 = *(WIMStruct **)p2;
+
+	return (int)swm1->hdr.part_number - (int)swm2->hdr.part_number;
+}
+
 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)
+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 ret;
-	unsigned i;
-	unsigned j;
-	WIMStruct *swm0;
 	WIMStruct **swms;
-	unsigned num_additional_swms;
-	WIMStruct *wim;
-
-	swm_open_flags |= WIMLIB_OPEN_FLAG_SPLIT_OK;
+	unsigned i;
+	int ret;
 
 	if (num_swms < 1 || num_swms > 0xffff)
 		return WIMLIB_ERR_INVALID_PARAM;
-	num_additional_swms = num_swms - 1;
 
-	swms = CALLOC(num_additional_swms, sizeof(swms[0]));
+	swms = CALLOC(num_swms, sizeof(swms[0]));
 	if (!swms)
 		return WIMLIB_ERR_NOMEM;
 
-	swm0 = NULL;
-	for (i = 0, j = 0; i < num_swms; i++) {
-		WIMStruct *swm;
-
-		ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swm,
-				      progress_func);
+	for (i = 0; i < num_swms; i++) {
+		ret = wimlib_open_wim_with_progress(swm_names[i],
+						    swm_open_flags,
+						    &swms[i],
+						    progfunc,
+						    progctx);
 		if (ret)
-			goto out_free_swms;
-		if (swm->hdr.part_number == 1 && swm0 == NULL)
-			swm0 = swm;
-		else
-			swms[j++] = swm;
+			goto out;
 	}
 
-	if (!swm0) {
-		ret = WIMLIB_ERR_SPLIT_INVALID;
-		goto out_free_swms;
-	}
+	qsort(swms, num_swms, sizeof(swms[0]), cmp_swms_by_part_number);
 
-	ret = wimlib_create_new_wim(swm0->compression_type, &wim);
+	ret = verify_swm_set(swms, num_swms);
 	if (ret)
-		goto out_free_swms;
+		goto out;
 
-	ret = wimlib_export_image(swm0, WIMLIB_ALL_IMAGES, wim, NULL, NULL, 0,
-				  swms, num_additional_swms, progress_func);
+	ret = wimlib_reference_resources(swms[0], swms + 1, num_swms - 1, 0);
 	if (ret)
-		goto out_free_wim;
-
-	wim->hdr.flags |= swm0->hdr.flags & (WIM_HDR_FLAG_RP_FIX |
-					     WIM_HDR_FLAG_READONLY);
-	if (!(wim_write_flags & (WIMLIB_WRITE_FLAG_CHECK_INTEGRITY |
-				 WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY)))
-	{
-		if (wim_has_integrity_table(swm0))
-			wim_write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
-	}
-	if (!(wim_write_flags & (WIMLIB_WRITE_FLAG_PIPABLE |
-				 WIMLIB_WRITE_FLAG_NOT_PIPABLE)))
-	{
-		if (wim_is_pipable(swm0))
-			wim_write_flags |= WIMLIB_WRITE_FLAG_PIPABLE;
-	}
-
+		goto out;
 
-	ret = wimlib_write(wim, output_path, WIMLIB_ALL_IMAGES,
-			   wim_write_flags, 1, progress_func);
-out_free_wim:
-	wimlib_free(wim);
-out_free_swms:
-	for (i = 0; i < num_additional_swms; i++)
+	/* 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);
-	wimlib_free(swm0);
 	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);
+}