X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsplit.c;h=5b14b924771451fd7c683ff4176209a60857750a;hp=0321492e7d7cfddc49aec925ba695859039dfaa3;hb=4f8059f2d0a74a9922128b162d9c9343b305999c;hpb=6f77434ea6ff1407603410e28d1edb966c40e568

diff --git a/src/split.c b/src/split.c
index 0321492e..5b14b924 100644
--- a/src/split.c
+++ b/src/split.c
@@ -5,258 +5,248 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * 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/.
  */
 
 #include "wimlib_internal.h"
 #include "lookup_table.h"
 #include "xml.h"
-#include "io.h"
+#include "buffer_io.h"
+#include <unistd.h>
+#include <fcntl.h>
 
-struct args {
+struct split_args {
 	WIMStruct *w;
-	char *swm_base_name;
+	tchar *swm_base_name;
 	size_t swm_base_name_len;
-	const char *swm_suffix;
-	struct lookup_table_entry *lte_chain_head;
-	struct lookup_table_entry *lte_chain_tail;
-	int    part_number;
-	int    write_flags;
-	long   size_remaining;
+	const tchar *swm_suffix;
+	struct list_head lte_list;
+	int cur_part_number;
+	int write_flags;
+	long size_remaining;
 	size_t part_size;
-	u64    total_bytes;
-	u64    total_bytes_written;
+	wimlib_progress_func_t progress_func;
+	union wimlib_progress_info progress;
 };
 
-static int finish_swm(WIMStruct *w, struct lookup_table_entry *lte_chain_head,
-		      int write_flags)
+static int
+finish_swm(WIMStruct *w, struct list_head *lte_list,
+	   int write_flags, wimlib_progress_func_t progress_func)
 {
-	off_t lookup_table_offset = ftello(w->out_fp);
 	int ret;
 
-	DEBUG("Writing lookup table for SWM (offset %"PRIu64")\n", 
-			lookup_table_offset);
-
-	while (lte_chain_head != NULL) {
-		ret = write_lookup_table_entry(lte_chain_head, w->out_fp);
-		if (ret != 0)
-			return ret;
-		struct lookup_table_entry *prev = lte_chain_head;
-		lte_chain_head = prev->next_lte_in_swm;
-		prev->next_lte_in_swm = NULL;
-	}
-	off_t xml_data_offset = ftello(w->out_fp);
-
-	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 = 
-				xml_data_offset - lookup_table_offset;
-	ret = finish_write(w, WIM_ALL_IMAGES, write_flags, 0);
-	if (ret != 0)
+	ret = write_lookup_table_from_stream_list(lte_list, w->out_fd,
+						  &w->hdr.lookup_table_res_entry);
+	if (ret)
 		return ret;
-
-	ret = fclose(w->out_fp);
-	if (ret != 0)
-		ret = WIMLIB_ERR_WRITE;
-	w->out_fp = NULL;
-	return ret;
+	return finish_write(w, WIMLIB_ALL_IMAGES,
+			    write_flags | WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE,
+			    progress_func);
 }
 
-static int copy_resource_to_swm(struct lookup_table_entry *lte, void *__args)
+static int
+copy_resource_to_swm(struct wim_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
 		 * start a new one. */
 
-		ret = finish_swm(w, args->lte_chain_head, args->write_flags);
+		ret = finish_swm(w, &args->lte_list, args->write_flags,
+				 args->progress_func);
+		if (ret)
+			return ret;
 
-		args->lte_chain_tail = NULL;
-		args->lte_chain_head = NULL;
+		if (args->progress_func) {
+			args->progress_func(WIMLIB_PROGRESS_MSG_SPLIT_END_PART,
+					    &args->progress);
+		}
 
-		sprintf(args->swm_base_name + args->swm_base_name_len, "%d", 
-			++args->part_number);
-		strcat(args->swm_base_name, args->swm_suffix);
+		INIT_LIST_HEAD(&args->lte_list);
+		args->cur_part_number++;
 
-		w->hdr.part_number = args->part_number;
+		tsprintf(args->swm_base_name + args->swm_base_name_len, T("%d%"TS),
+			 args->cur_part_number, args->swm_suffix);
 
-		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);
+		w->hdr.part_number = args->cur_part_number;
+
+		if (args->progress_func) {
+			args->progress.split.cur_part_number = args->cur_part_number;
+			args->progress_func(WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART,
+					    &args->progress);
+		}
 
 		ret = begin_write(w, args->swm_base_name, args->write_flags);
-		if (ret != 0)
+		if (ret)
 			return ret;
 		args->size_remaining = args->part_size;
 	}
 	args->size_remaining -= lte->resource_entry.size;
-	args->total_bytes_written += lte->resource_entry.size;
-	if (args->lte_chain_tail)
-		args->lte_chain_tail->next_lte_in_swm = lte;
-	else
-		args->lte_chain_head = lte;
-	args->lte_chain_tail = lte;
+	args->progress.split.completed_bytes += lte->resource_entry.size;
+	list_add_tail(&lte->swm_stream_list, &args->lte_list);
 	return copy_resource(lte, w);
 }
 
-/* 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, 
-			   size_t part_size, int flags)
+/* Splits the WIM file @w into multiple parts prefixed by @swm_name with size at
+ * most @part_size bytes. */
+WIMLIBAPI int
+wimlib_split(WIMStruct *w, const tchar *swm_name,
+	     size_t part_size, int write_flags,
+	     wimlib_progress_func_t progress_func)
 {
 	int ret;
-	WIMStruct *w;
-	int write_flags = 0;
-	size_t swm_name_len = strlen(swm_name);
+	struct wim_header hdr_save;
+	struct split_args args;
+	const tchar *swm_suffix;
+	size_t swm_name_len;
 	size_t swm_base_name_len;
-	char name[swm_name_len + 20];
-	char *swm_suffix;
 
-	struct lookup_table_entry *lte_chain_head = NULL;
-	struct lookup_table_entry *lte_chain_tail = NULL;
-	long size_remaining = part_size;
-	u64 total_bytes_written = 0;
-	u64 total_bytes;
+	if (!swm_name || part_size == 0)
+		return WIMLIB_ERR_INVALID_PARAM;
 
-	ret = wimlib_open_wim(wimfile, flags, &w);
-	if (ret != 0)
-		return ret;
+	if (w->hdr.total_parts != 1)
+		return WIMLIB_ERR_SPLIT_UNSUPPORTED;
+
+	write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
 
-	total_bytes = wim_info_get_total_bytes(w->wim_info);
+	ret = wim_checksum_unhashed_streams(w);
+	if (ret)
+		return ret;
 
-	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;
+	swm_name_len = tstrlen(swm_name);
+	tchar swm_base_name[swm_name_len + 20];
 
+	memcpy(&hdr_save, &w->hdr, sizeof(struct wim_header));
 	w->hdr.flags |= WIM_HDR_FLAG_SPANNED;
 	w->hdr.boot_idx = 0;
 	randomize_byte_array(w->hdr.guid, WIM_GID_LEN);
 	ret = begin_write(w, swm_name, write_flags);
-	if (ret != 0)
-		return ret;
+	if (ret)
+		goto out;
+
+	tmemcpy(swm_base_name, swm_name, swm_name_len + 1);
 
-	swm_suffix = strchr(swm_name, '.');
-	memcpy(name, swm_name, swm_name_len + 1);
+	swm_suffix = tstrchr(swm_name, T('.'));
 	if (swm_suffix) {
 		swm_base_name_len = swm_suffix - swm_name;
 	} else {
 		swm_base_name_len = swm_name_len;
-		name[sizeof(name) - 1] = '\0';
-		swm_suffix = &name[sizeof(name) - 1];
+		swm_base_name[ARRAY_LEN(swm_base_name) - 1] = T('\0');
+		swm_suffix = &swm_base_name[ARRAY_LEN(swm_base_name) - 1];
 	}
 
-	if (write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
-		printf("Writing `%s' (%.2f %% done)\n", 
-			swm_name, 
-			(double)total_bytes_written /
-				(double)total_bytes * 100.0);
+	args.w                              = w;
+	args.swm_base_name                  = swm_base_name;
+	args.swm_base_name_len              = swm_base_name_len;
+	args.swm_suffix                     = swm_suffix;
+	INIT_LIST_HEAD(&args.lte_list);
+	args.cur_part_number                = 1;
+	args.write_flags                    = write_flags;
+	args.size_remaining                 = part_size;
+	args.part_size                      = part_size;
+	args.progress_func                  = progress_func;
+	args.progress.split.total_bytes     = lookup_table_total_stream_size(w->lookup_table);
+	args.progress.split.cur_part_number = 1;
+	args.progress.split.completed_bytes = 0;
+	args.progress.split.part_name       = swm_base_name;
+
+	if (progress_func) {
+		progress_func(WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART,
+			      &args.progress);
+	}
 
-	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;
+		struct wim_lookup_table_entry *metadata_lte;
+		metadata_lte = w->image_metadata[i]->metadata_lte;
 		ret = copy_resource(metadata_lte, w);
-		if (ret != 0)
-			return ret;
-		size_remaining -= metadata_lte->resource_entry.size;
-		total_bytes_written += metadata_lte->resource_entry.size;
-		if (lte_chain_tail)
-			lte_chain_tail->next_lte_in_swm = metadata_lte;
-		else
-			lte_chain_head = metadata_lte;
-		lte_chain_tail = metadata_lte;
+		if (ret)
+			goto out;
+		args.size_remaining -= metadata_lte->resource_entry.size;
+		args.progress.split.completed_bytes += metadata_lte->resource_entry.size;
+		/* Careful: The metadata lookup table entries must be added in
+		 * order of the images. */
+		list_add_tail(&metadata_lte->swm_stream_list, &args.lte_list);
 	}
-	w->write_metadata = false;
-
-	struct args args = {
-		.w                 = w,
-		.swm_base_name     = name,
-		.swm_base_name_len = swm_base_name_len,
-		.swm_suffix        = swm_suffix,
-		.lte_chain_head    = lte_chain_head,
-		.lte_chain_tail    = lte_chain_tail,
-		.part_number       = 1,
-		.write_flags       = write_flags,
-		.size_remaining    = size_remaining,
-		.part_size         = part_size,
-		.total_bytes        = total_bytes,
-		.total_bytes_written = total_bytes_written,
-	};
-
-	ret = for_lookup_table_entry(w->lookup_table, copy_resource_to_swm, &args);
-	if (ret != 0)
-		return ret;
 
-	ret = finish_swm(w, args.lte_chain_head, write_flags);
-	if (ret != 0)
-		return ret;
+	ret = for_lookup_table_entry_pos_sorted(w->lookup_table,
+						copy_resource_to_swm,
+						&args);
+	if (ret)
+		goto out;
+
+	ret = finish_swm(w, &args.lte_list, write_flags, progress_func);
+	if (ret)
+		goto out;
 
+	if (progress_func) {
+		progress_func(WIMLIB_PROGRESS_MSG_SPLIT_END_PART,
+			      &args.progress);
+	}
 
 	/* The swms are all ready now, except the total_parts and part_number
-	 * fields in their headers are wrong (we don't know the total parts
-	 * until they are all written).  Fix them. */
-	int total_parts = args.part_number;
+	 * fields in their headers are wrong (since we don't know the total
+	 * parts until they are all written).  Fix them. */
+	int total_parts = args.cur_part_number;
 	for (int i = 1; i <= total_parts; i++) {
-		const char *p;
+		const tchar *part_name;
+		int part_fd;
+		u8 part_data_buf[4];
+		size_t bytes_written;
+
 		if (i == 1) {
-			p = swm_name;
+			part_name = swm_name;
 		} else {
-			sprintf(name + swm_base_name_len, "%d", i);
-			p = strcat(name, swm_suffix);
+			tsprintf(swm_base_name + swm_base_name_len, T("%d%"TS),
+				 i, swm_suffix);
+			part_name = swm_base_name;
 		}
 
-		FILE *fp = fopen(p, "r+b");
-		if (!fp) {
-			ERROR("Failed to open `%s': %m\n", p);
-			return WIMLIB_ERR_OPEN;
+		part_fd = topen(part_name, O_WRONLY | O_BINARY);
+		if (part_fd == -1) {
+			ERROR_WITH_ERRNO("Failed to open `%"TS"'", part_name);
+			ret = WIMLIB_ERR_OPEN;
+			goto out;
 		}
-		char buf[4];
-		put_u16(buf, i);
-		put_u16(buf + 2, total_parts);
-
-		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);
-			return WIMLIB_ERR_WRITE;
+		put_u16(&part_data_buf[0], i);
+		put_u16(&part_data_buf[2], total_parts);
+
+		bytes_written = full_pwrite(part_fd, part_data_buf,
+					    sizeof(part_data_buf), 40);
+		ret = close(part_fd);
+		if (bytes_written != sizeof(part_data_buf) || ret != 0) {
+			ERROR_WITH_ERRNO("Error updating header of `%"TS"'",
+					 part_name);
+			ret = WIMLIB_ERR_WRITE;
+			goto out;
 		}
 	}
-	if (write_flags & WIMLIB_OPEN_FLAG_SHOW_PROGRESS)
-		printf("Done!\n");
-	wimlib_free(w);
-	return 0;
+	ret = 0;
+out:
+	close_wim_writable(w);
+	memcpy(&w->hdr, &hdr_save, sizeof(struct wim_header));
+	return ret;
 }