X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fsplit.c;h=4167ecdfdb59648676f6d242f1bd87f9c7ebabe9;hb=45c3ad86e44a05a169bfb1fa8ff318861bbf9fbf;hp=0321492e7d7cfddc49aec925ba695859039dfaa3;hpb=6f77434ea6ff1407603410e28d1edb966c40e568;p=wimlib

diff --git a/src/split.c b/src/split.c
index 0321492e..4167ecdf 100644
--- a/src/split.c
+++ b/src/split.c
@@ -10,16 +10,16 @@
  * This file is part of wimlib, a library for working with WIM files.
  *
  * 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)
+ * 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 Lesser General Public License for more
+ * 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
+ * You should have received a copy of the GNU General Public License
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
@@ -28,7 +28,7 @@
 #include "xml.h"
 #include "io.h"
 
-struct args {
+struct split_args {
 	WIMStruct *w;
 	char *swm_base_name;
 	size_t swm_base_name_len;
@@ -49,7 +49,7 @@ static int finish_swm(WIMStruct *w, struct lookup_table_entry *lte_chain_head,
 	off_t lookup_table_offset = ftello(w->out_fp);
 	int ret;
 
-	DEBUG("Writing lookup table for SWM (offset %"PRIu64")\n", 
+	DEBUG("Writing lookup table for SWM (offset %"PRIu64")",
 			lookup_table_offset);
 
 	while (lte_chain_head != NULL) {
@@ -57,7 +57,7 @@ static int finish_swm(WIMStruct *w, struct lookup_table_entry *lte_chain_head,
 		if (ret != 0)
 			return ret;
 		struct lookup_table_entry *prev = lte_chain_head;
-		lte_chain_head = prev->next_lte_in_swm;
+		lte_chain_head = lte_chain_head->next_lte_in_swm;
 		prev->next_lte_in_swm = NULL;
 	}
 	off_t xml_data_offset = ftello(w->out_fp);
@@ -65,31 +65,23 @@ static int finish_swm(WIMStruct *w, struct lookup_table_entry *lte_chain_head,
 	if (lookup_table_offset == -1 || xml_data_offset == -1)
 		return WIMLIB_ERR_WRITE;
 	w->hdr.lookup_table_res_entry.offset = lookup_table_offset;
-	w->hdr.lookup_table_res_entry.size = 
+	w->hdr.lookup_table_res_entry.size =
 				xml_data_offset - lookup_table_offset;
-	ret = finish_write(w, WIM_ALL_IMAGES, write_flags, 0);
-	if (ret != 0)
-		return ret;
-
-	ret = fclose(w->out_fp);
-	if (ret != 0)
-		ret = WIMLIB_ERR_WRITE;
-	w->out_fp = NULL;
-	return ret;
+	return finish_write(w, WIM_ALL_IMAGES,
+			    write_flags | WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE);
 }
 
 static int copy_resource_to_swm(struct lookup_table_entry *lte, void *__args)
 {
-	struct args *args = (struct args*)__args;
+	struct split_args *args = (struct split_args*)__args;
 	WIMStruct *w = args->w;
-	FILE *out_fp = w->out_fp;
 	int ret;
 
 	/* metadata resources were already written. */
 	if (lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA)
 		return 0;
 
-	if (args->size_remaining < 0 || 
+	if (args->size_remaining < 0 ||
 			(u64)args->size_remaining < lte->resource_entry.size) {
 
 		/* No space for this resource.  Finish the previous swm and
@@ -100,20 +92,19 @@ static int copy_resource_to_swm(struct lookup_table_entry *lte, void *__args)
 		args->lte_chain_tail = NULL;
 		args->lte_chain_head = NULL;
 
-		sprintf(args->swm_base_name + args->swm_base_name_len, "%d", 
-			++args->part_number);
-		strcat(args->swm_base_name, args->swm_suffix);
+		sprintf(args->swm_base_name + args->swm_base_name_len, "%d%s",
+			++args->part_number, args->swm_suffix);
 
 		w->hdr.part_number = args->part_number;
 
 		if (args->write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
 			printf("Writing `%s' (%"PRIu64" of %"PRIu64" bytes, "
-					"%.0f%% done)\n", 
-				args->swm_base_name, 
-				args->total_bytes_written,
-				args->total_bytes,
-				(double)args->total_bytes_written /
-				 	(double)args->total_bytes * 100.0);
+			       "%.0f%% done)\n",
+			       args->swm_base_name,
+			       args->total_bytes_written,
+			       args->total_bytes,
+			       (double)args->total_bytes_written /
+			           (double)args->total_bytes * 100.0);
 
 		ret = begin_write(w, args->swm_base_name, args->write_flags);
 		if (ret != 0)
@@ -132,7 +123,7 @@ static int copy_resource_to_swm(struct lookup_table_entry *lte, void *__args)
 
 /* Splits the WIM file @wimfile into multiple parts prefixed by @swm_name with
  * size at most @part_size. */
-WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name, 
+WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name,
 			   size_t part_size, int flags)
 {
 	int ret;
@@ -178,17 +169,18 @@ WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name,
 	}
 
 	if (write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
-		printf("Writing `%s' (%.2f %% done)\n", 
-			swm_name, 
+		printf("Writing `%s' (%.2f %% done)\n",
+			swm_name,
 			(double)total_bytes_written /
 				(double)total_bytes * 100.0);
 
 	w->write_metadata = true;
 	for (int i = 0; i < w->hdr.image_count; i++) {
-
 		struct lookup_table_entry *metadata_lte;
 
-		metadata_lte = w->image_metadata[i].lookup_table_entry;
+		DEBUG("Writing metadata resource %d", i);
+
+		metadata_lte = w->image_metadata[i].metadata_lte;
 		ret = copy_resource(metadata_lte, w);
 		if (ret != 0)
 			return ret;
@@ -202,7 +194,7 @@ WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name,
 	}
 	w->write_metadata = false;
 
-	struct args args = {
+	struct split_args args = {
 		.w                 = w,
 		.swm_base_name     = name,
 		.swm_base_name_len = swm_base_name_len,
@@ -241,22 +233,23 @@ WIMLIBAPI int wimlib_split(const char *wimfile, const char *swm_name,
 
 		FILE *fp = fopen(p, "r+b");
 		if (!fp) {
-			ERROR("Failed to open `%s': %m\n", p);
+			ERROR_WITH_ERRNO("Failed to open `%s'", p);
 			return WIMLIB_ERR_OPEN;
 		}
-		char buf[4];
-		put_u16(buf, i);
-		put_u16(buf + 2, total_parts);
+		u8 buf[4];
+		put_u16(&buf[0], i);
+		put_u16(&buf[2], total_parts);
 
-		if (fseek(fp, 40, SEEK_SET) != 0 || 
+		if (fseek(fp, 40, SEEK_SET) != 0 ||
 				fwrite(buf, 1, sizeof(buf), fp) != sizeof(buf)
 				|| fclose(fp) != 0) {
-			ERROR("Error overwriting header of `%s': %m\n", name);
+			ERROR_WITH_ERRNO("Error overwriting header of `%s'",
+					 name);
 			return WIMLIB_ERR_WRITE;
 		}
 	}
 	if (write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
-		printf("Done!\n");
+		puts("Done!");
 	wimlib_free(w);
 	return 0;
 }