X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=7999b683afc5b59ef4ca66ef992d49e929117a22;hb=4bdcbacffa3e83e344cd53d9d56974dc64dd1eed;hp=f61eaaf5eebdc6cc92f37e88dd7c8ac34d8b9df5;hpb=2d14d2982e057b2d99128c20c9768985bdfcd0a0;p=wimlib

diff --git a/src/join.c b/src/join.c
index f61eaaf5..7999b683 100644
--- a/src/join.c
+++ b/src/join.c
@@ -7,20 +7,18 @@
 /*
  * Copyright (C) 2012, 2013 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
@@ -96,7 +94,7 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
 		 * checked to be the same as wim->hdr.total_parts.  Otherwise, it
 		 * could be unexpectedly high and cause a stack overflow. */
 		WIMStruct *parts_to_swms[num_additional_swms];
-		ZERO_ARRAY(parts_to_swms);
+		memset(parts_to_swms, 0, sizeof(parts_to_swms));
 		for (unsigned i = 0; i < num_additional_swms; i++) {
 
 			WIMStruct *swm = additional_swms[i];
@@ -149,14 +147,14 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
 	return 0;
 }
 
-/* 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,
-	    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;
@@ -178,8 +176,11 @@ wimlib_join(const tchar * const *swm_names,
 	for (i = 0, j = 0; i < num_swms; i++) {
 		WIMStruct *swm;
 
-		ret = wimlib_open_wim(swm_names[i], swm_open_flags, &swm,
-				      progress_func);
+		ret = wimlib_open_wim_with_progress(swm_names[i],
+						    swm_open_flags,
+						    &swm,
+						    progfunc,
+						    progctx);
 		if (ret)
 			goto out_free_swms;
 		if (swm->hdr.part_number == 1 && swm0 == NULL)
@@ -203,14 +204,14 @@ wimlib_join(const tchar * const *swm_names,
 	if (ret)
 		goto out_free_swms;
 
-	swm0->guid_set_explicitly = 1;
-
 	/* 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(swm0, output_path, WIMLIB_ALL_IMAGES,
-			   wim_write_flags | WIMLIB_WRITE_FLAG_STREAMS_OK,
-			   1, progress_func);
+			   wim_write_flags |
+				WIMLIB_WRITE_FLAG_STREAMS_OK |
+				WIMLIB_WRITE_FLAG_RETAIN_GUID,
+			   1);
 out_free_swms:
 	for (i = 0; i < num_additional_swms + 1; i++)
 		wimlib_free(additional_swms[i]);
@@ -218,3 +219,16 @@ out_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);
+}