X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=496b31812acd5d63550597f31bc76654431738c0;hb=319752e2694f851bfd5c85d03466d0d4b1e89c22;hp=1326804b428482aa15667cd111f7545a1e0a191f;hpb=393e8e46f87e6119f85b7fc9910624f567c5a34b;p=wimlib

diff --git a/src/join.c b/src/join.c
index 1326804b..496b3181 100644
--- a/src/join.c
+++ b/src/join.c
@@ -2,56 +2,31 @@
  * join.c
  *
  * Join split WIMs (sometimes named as .swm files) together into one WIM.
- *
- * Copyright (C) 2010 Carl Thijssen
+ */
+
+/*
  * 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 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.
  *
- * 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 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 wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib.h"
+#include "wimlib_internal.h"
 #include "lookup_table.h"
 #include "xml.h"
 
-static int join_resource(struct lookup_table_entry *lte, void *split_wim)
-{
-	FILE *split_wim_fp = ((WIMStruct*)split_wim)->fp;
-	FILE *joined_wim_fp = ((WIMStruct*)split_wim)->out_fp;
-	int ret;
-
-	u64 size = lte->resource_entry.size;
-	u64 offset = lte->resource_entry.offset;
-	off_t new_offset = ftello(joined_wim_fp);
-
-	if (new_offset == -1)
-		return WIMLIB_ERR_WRITE;
-
-	ret = copy_between_files(split_wim_fp, offset, joined_wim_fp, size);
-	if (ret != 0)
-		return ret;
-
-	memcpy(&lte->output_resource_entry, &lte->resource_entry, 
-			sizeof(struct resource_entry));
-
-	lte->output_resource_entry.offset = new_offset;
-	lte->out_refcnt = lte->refcnt;
-	lte->part_number = 1;
-	return 0;
-}
-
 static int join_wims(WIMStruct **swms, uint num_swms, WIMStruct *joined_wim,
 		     int write_flags)
 {
@@ -60,21 +35,40 @@ static int join_wims(WIMStruct **swms, uint num_swms, WIMStruct *joined_wim,
 	FILE *out_fp = joined_wim->out_fp;
 	u64 total_bytes = wim_info_get_total_bytes(swms[0]->wim_info);
 
-	/* The following loop writes both file resources and metadata resources
-	 * because it loops over the lookup table entries rather than the dentry
-	 * tree for the images */
+	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, %.2f%% done)\n",
-					i + 1, num_swms,
-					cur_offset, total_bytes,
-					(double)cur_offset / total_bytes * 100.0);
+			       "(%"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_WITH_ERRNO("Failed to reopen `%s'",
+					 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, 
-					     join_resource, swms[i]);
+					     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].metadata_lte, 
+				    swms[0]);
 		if (ret != 0)
 			return ret;
 	}
@@ -94,18 +88,19 @@ static int join_wims(WIMStruct **swms, uint num_swms, WIMStruct *joined_wim,
 	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");
+		ERROR_WITH_ERRNO("Failed to get file offset");
 		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;
 
-	swms[0]->hdr.flags &= ~WIM_HDR_FLAG_SPANNED;
 
 	/* 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);
 }
 
@@ -133,43 +128,48 @@ WIMLIBAPI int wimlib_join(const char **swm_names, int num_swms,
 		if (ret != 0)
 			goto err;
 
+		/* don't open all the parts at the same time, in case there are
+		 * a lot of 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");
+				      "compression type");
 				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");
+				ERROR("The split WIMs do not all have the same "
+				      "GUID");
 				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);
+			      "but %d parts were specified",
+			      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);
+			ERROR("`%s' says it is part %d, but expected a number "
+			      "between 1 and %d",
+			      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);
+			ERROR("`%s' and `%s' both say they are part %d of %d",
+			      swm_names[i], swms[part_idx]->filename,
+			      w->hdr.part_number, num_swms);
 			ret = WIMLIB_ERR_SPLIT_INVALID;
 			goto err;
 		}