X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwim.c;h=ba0702f7949a4260650182b25de720409046fac6;hp=f2794fe86c61047b09a3ba6735b7c49828dbb81c;hb=7c9fba5efecc3fd82b423238d1a4fe090f04e7f9;hpb=650997e4865a090b6856c7ca34b02f42994e8e29

diff --git a/src/wim.c b/src/wim.c
index f2794fe8..ba0702f7 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -5,8 +5,6 @@
 /*
  * Copyright (C) 2012, 2013 Eric Biggers
  *
- * wimlib - Library for working with WIM files
- *
  * 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
@@ -23,37 +21,43 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
+#include "wimlib/error.h"
+#include "wimlib/dentry.h"
+#include "wimlib/encoding.h"
+#include "wimlib/file_io.h"
+#include "wimlib/integrity.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
 #ifdef WITH_NTFS_3G
-#  include <time.h>
-#  include <ntfs-3g/volume.h>
+#  include "wimlib/ntfs_3g.h" /* for do_ntfs_umount() */
 #endif
+#include "wimlib/security.h"
+#include "wimlib/wim.h"
+#include "wimlib/xml.h"
 
 #ifdef __WIN32__
-#  include "win32.h"
-#else
-#  include <langinfo.h>
+#  include "wimlib/win32.h" /* for realpath() replacement */
 #endif
 
-#include "buffer_io.h"
-#include "dentry.h"
-#include "lookup_table.h"
-#include "wimlib_internal.h"
-#include "xml.h"
+#include <errno.h>
+#include <fcntl.h>
+#ifndef __WIN32__
+#  include <langinfo.h>
+#endif
+#include <limits.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 static int
 image_print_metadata(WIMStruct *w)
 {
 	DEBUG("Printing metadata for image %d", w->current_image);
-	print_security_data(wim_security_data(w));
+	print_wim_security_data(wim_security_data(w));
 	return for_dentry_in_tree(wim_root_dentry(w), print_dentry,
 				  w->lookup_table);
 }
@@ -67,18 +71,14 @@ image_print_files(WIMStruct *w)
 }
 
 static WIMStruct *
-new_wim_struct()
+new_wim_struct(void)
 {
 	WIMStruct *w = CALLOC(1, sizeof(WIMStruct));
-#ifdef WITH_FUSE
-	if (pthread_mutex_init(&w->fp_tab_mutex, NULL) != 0) {
-		ERROR_WITH_ERRNO("Failed to initialize mutex");
-		FREE(w);
-		w = NULL;
+	if (w) {
+		w->in_fd = -1;
+		w->out_fd = -1;
 	}
-#endif
 	return w;
-
 }
 
 /*
@@ -115,65 +115,6 @@ for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *))
 	return 0;
 }
 
-static int
-sort_image_metadata_by_position(const void *p1, const void *p2)
-{
-	const struct wim_image_metadata *imd1 = p1;
-	const struct wim_image_metadata *imd2 = p2;
-	u64 offset1 = imd1->metadata_lte->resource_entry.offset;
-	u64 offset2 = imd2->metadata_lte->resource_entry.offset;
-	if (offset1 < offset2)
-		return -1;
-	else if (offset1 > offset2)
-		return 1;
-	else
-		return 0;
-}
-
-/*
- * If @lte points to a metadata resource, append it to the list of metadata
- * resources in the WIMStruct.  Otherwise, do nothing.
- */
-static int
-append_metadata_resource_entry(struct wim_lookup_table_entry *lte, void *wim_p)
-{
-	WIMStruct *w = wim_p;
-	int ret = 0;
-
-	if (lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) {
-		if (w->current_image == w->hdr.image_count) {
-			ERROR("The WIM header says there are %u images in the WIM,\n"
-			      "        but we found more metadata resources than this",
-			      w->hdr.image_count);
-			ret = WIMLIB_ERR_IMAGE_COUNT;
-		} else {
-			DEBUG("Found metadata resource for image %u at "
-			      "offset %"PRIu64".",
-			      w->current_image + 1,
-			      lte->resource_entry.offset);
-			w->image_metadata[
-				w->current_image++].metadata_lte = lte;
-		}
-	}
-	return ret;
-}
-
-/* Returns the compression type given in the flags of a WIM header. */
-static int
-wim_hdr_flags_compression_type(int wim_hdr_flags)
-{
-	if (wim_hdr_flags & WIM_HDR_FLAG_COMPRESSION) {
-		if (wim_hdr_flags & WIM_HDR_FLAG_COMPRESS_LZX)
-			return WIMLIB_COMPRESSION_TYPE_LZX;
-		else if (wim_hdr_flags & WIM_HDR_FLAG_COMPRESS_XPRESS)
-			return WIMLIB_COMPRESSION_TYPE_XPRESS;
-		else
-			return WIMLIB_COMPRESSION_TYPE_INVALID;
-	} else {
-		return WIMLIB_COMPRESSION_TYPE_NONE;
-	}
-}
-
 /*
  * Creates a WIMStruct for a new WIM file.
  */
@@ -184,6 +125,8 @@ wimlib_create_new_wim(int ctype, WIMStruct **w_ret)
 	struct wim_lookup_table *table;
 	int ret;
 
+	wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
+
 	DEBUG("Creating new WIM with %"TS" compression.",
 	      wimlib_get_compression_type_string(ctype));
 
@@ -202,6 +145,8 @@ wimlib_create_new_wim(int ctype, WIMStruct **w_ret)
 		goto out_free;
 	}
 	w->lookup_table = table;
+	w->refcnts_ok = 1;
+	w->compression_type = ctype;
 	*w_ret = w;
 	return 0;
 out_free:
@@ -209,12 +154,6 @@ out_free:
 	return ret;
 }
 
-WIMLIBAPI int
-wimlib_get_num_images(const WIMStruct *w)
-{
-	return w->hdr.image_count;
-}
-
 int
 select_wim_image(WIMStruct *w, int image)
 {
@@ -242,22 +181,20 @@ select_wim_image(WIMStruct *w, int image)
 	if (w->current_image != WIMLIB_NO_IMAGE) {
 		imd = wim_get_current_image_metadata(w);
 		if (!imd->modified) {
+			wimlib_assert(list_empty(&imd->unhashed_streams));
 			DEBUG("Freeing image %u", w->current_image);
-			destroy_image_metadata(imd, NULL);
-			imd->root_dentry = NULL;
-			imd->security_data = NULL;
-			INIT_HLIST_HEAD(&imd->inode_list);
+			destroy_image_metadata(imd, NULL, false);
 		}
 	}
 	w->current_image = image;
-	imd = &w->image_metadata[image - 1];
-	if (imd->root_dentry) {
+	imd = wim_get_current_image_metadata(w);
+	if (imd->root_dentry || imd->modified) {
 		ret = 0;
 	} else {
 		#ifdef ENABLE_DEBUG
 		DEBUG("Reading metadata resource specified by the following "
 		      "lookup table entry:");
-		print_lookup_table_entry(imd->metadata_lte, stdout);
+		print_lookup_table_entry(imd->metadata_lte, stderr);
 		#endif
 		ret = read_metadata_resource(w, imd);
 		if (ret)
@@ -267,13 +204,6 @@ select_wim_image(WIMStruct *w, int image)
 }
 
 
-/* Returns the compression type of the WIM file. */
-WIMLIBAPI int
-wimlib_get_compression_type(const WIMStruct *w)
-{
-	return wim_hdr_flags_compression_type(w->hdr.flags);
-}
-
 WIMLIBAPI const tchar *
 wimlib_get_compression_type_string(int ctype)
 {
@@ -298,7 +228,7 @@ WIMLIBAPI int
 wimlib_resolve_image(WIMStruct *w, const tchar *image_name_or_num)
 {
 	tchar *p;
-	int image;
+	long image;
 	int i;
 
 	if (!image_name_or_num || !*image_name_or_num)
@@ -314,8 +244,8 @@ wimlib_resolve_image(WIMStruct *w, const tchar *image_name_or_num)
 		return image;
 	} else {
 		for (i = 1; i <= w->hdr.image_count; i++) {
-			if (tstrcmp(image_name_or_num,
-				    wimlib_get_image_name(w, i)) == 0)
+			if (!tstrcmp(image_name_or_num,
+				     wimlib_get_image_name(w, i)))
 				return i;
 		}
 		return WIMLIB_NO_IMAGE;
@@ -324,35 +254,31 @@ wimlib_resolve_image(WIMStruct *w, const tchar *image_name_or_num)
 
 /* Prints some basic information about a WIM file. */
 WIMLIBAPI void
-wimlib_print_wim_information(const WIMStruct *w)
+wimlib_print_wim_information(const WIMStruct *wim)
 {
-	const struct wim_header *hdr;
+	struct wimlib_wim_info info;
+
+	wimlib_get_wim_info((WIMStruct*)wim, &info);
 
-	hdr = &w->hdr;
 	tputs(T("WIM Information:"));
 	tputs(T("----------------"));
-	tprintf(T("Path:           %"TS"\n"), w->filename);
+	tprintf(T("Path:           %"TS"\n"), wim->filename);
 	tfputs(T("GUID:           0x"), stdout);
-	print_byte_field(hdr->guid, WIM_GID_LEN);
+	print_byte_field(info.guid, WIM_GID_LEN, stdout);
 	tputchar(T('\n'));
-	tprintf(T("Image Count:    %d\n"), hdr->image_count);
+	tprintf(T("Image Count:    %d\n"), info.image_count);
 	tprintf(T("Compression:    %"TS"\n"),
-		wimlib_get_compression_type_string(wimlib_get_compression_type(w)));
-	tprintf(T("Part Number:    %d/%d\n"), hdr->part_number, hdr->total_parts);
-	tprintf(T("Boot Index:     %d\n"), hdr->boot_idx);
-	tprintf(T("Size:           %"PRIu64" bytes\n"),
-		wim_info_get_total_bytes(w->wim_info));
+		wimlib_get_compression_type_string(info.compression_type));
+	tprintf(T("Part Number:    %d/%d\n"), info.part_number, info.total_parts);
+	tprintf(T("Boot Index:     %d\n"), info.boot_index);
+	tprintf(T("Size:           %"PRIu64" bytes\n"), info.total_bytes);
 	tprintf(T("Integrity Info: %"TS"\n"),
-		(w->hdr.integrity.offset != 0) ? T("yes") : T("no"));
+		info.has_integrity_table ? T("yes") : T("no"));
+	tprintf(T("Relative path junction: %"TS"\n"),
+		info.has_rpfix ? T("yes") : T("no"));
 	tputchar(T('\n'));
 }
 
-WIMLIBAPI bool
-wimlib_has_integrity_table(const WIMStruct *w)
-{
-	return w->hdr.integrity.size != 0;
-}
-
 WIMLIBAPI void
 wimlib_print_available_images(const WIMStruct *w, int image)
 {
@@ -407,44 +333,169 @@ wimlib_print_files(WIMStruct *w, int image)
 	return for_image(w, image, image_print_files);
 }
 
-/* Sets the index of the bootable image. */
 WIMLIBAPI int
-wimlib_set_boot_idx(WIMStruct *w, int boot_idx)
+wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info)
 {
-	if (w->hdr.total_parts != 1) {
-		ERROR("Cannot modify the boot index of a split WIM!");
-		return WIMLIB_ERR_SPLIT_UNSUPPORTED;
+	memset(info, 0, sizeof(struct wimlib_wim_info));
+	memcpy(info->guid, wim->hdr.guid, WIMLIB_GUID_LEN);
+	info->image_count = wim->hdr.image_count;
+	info->boot_index = wim->hdr.boot_idx;
+	info->wim_version = WIM_VERSION;
+	info->chunk_size = WIM_CHUNK_SIZE;
+	info->part_number = wim->hdr.part_number;
+	info->total_parts = wim->hdr.total_parts;
+	info->compression_type = wim->compression_type;
+	if (wim->wim_info)
+		info->total_bytes = wim->wim_info->total_bytes;
+	else
+		info->total_bytes = 0;
+	info->has_integrity_table = wim->hdr.integrity.offset != 0;
+	info->opened_from_file = (wim->filename != NULL);
+	info->is_readonly = (wim->hdr.flags & WIM_HDR_FLAG_READONLY) ||
+			     (wim->hdr.total_parts != 1) ||
+			     (wim->filename && taccess(wim->filename, W_OK));
+	info->has_rpfix = (wim->hdr.flags & WIM_HDR_FLAG_RP_FIX) != 0;
+	info->is_marked_readonly = (wim->hdr.flags & WIM_HDR_FLAG_READONLY) != 0;
+	info->write_in_progress = (wim->hdr.flags & WIM_HDR_FLAG_WRITE_IN_PROGRESS) != 0;
+	info->metadata_only = (wim->hdr.flags & WIM_HDR_FLAG_METADATA_ONLY) != 0;
+	info->resource_only = (wim->hdr.flags & WIM_HDR_FLAG_RESOURCE_ONLY) != 0;
+	info->spanned = (wim->hdr.flags & WIM_HDR_FLAG_SPANNED) != 0;
+	return 0;
+}
+
+
+/* Deprecated */
+WIMLIBAPI int
+wimlib_get_boot_idx(const WIMStruct *wim)
+{
+	struct wimlib_wim_info info;
+
+	wimlib_get_wim_info((WIMStruct*)wim, &info);
+	return info.boot_index;
+}
+
+/* Deprecated */
+WIMLIBAPI int
+wimlib_get_compression_type(const WIMStruct *wim)
+{
+	struct wimlib_wim_info info;
+
+	wimlib_get_wim_info((WIMStruct*)wim, &info);
+	return info.compression_type;
+}
+
+/* Deprecated */
+WIMLIBAPI int
+wimlib_get_num_images(const WIMStruct *wim)
+{
+	struct wimlib_wim_info info;
+
+	wimlib_get_wim_info((WIMStruct*)wim, &info);
+	return info.image_count;
+}
+
+/* Deprecated */
+WIMLIBAPI int
+wimlib_get_part_number(const WIMStruct *wim, int *total_parts_ret)
+{
+	struct wimlib_wim_info info;
+
+	wimlib_get_wim_info((WIMStruct*)wim, &info);
+	if (total_parts_ret)
+		*total_parts_ret = info.total_parts;
+	return info.part_number;
+}
+
+/* Deprecated */
+WIMLIBAPI bool
+wimlib_has_integrity_table(const WIMStruct *wim)
+{
+	struct wimlib_wim_info info;
+
+	wimlib_get_wim_info((WIMStruct*)wim, &info);
+	return info.has_integrity_table;
+}
+
+WIMLIBAPI int
+wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int which)
+{
+	int ret;
+
+	if (which & WIMLIB_CHANGE_READONLY_FLAG) {
+		if (info->is_marked_readonly)
+			wim->hdr.flags |= WIM_HDR_FLAG_READONLY;
+		else
+			wim->hdr.flags &= ~WIM_HDR_FLAG_READONLY;
 	}
-	if (boot_idx < 0 || boot_idx > w->hdr.image_count)
-		return WIMLIB_ERR_INVALID_IMAGE;
-	w->hdr.boot_idx = boot_idx;
 
-	if (boot_idx == 0) {
-		memset(&w->hdr.boot_metadata_res_entry, 0,
-		       sizeof(struct resource_entry));
-	} else {
-		memcpy(&w->hdr.boot_metadata_res_entry,
-		       &w->image_metadata[
-			  boot_idx - 1].metadata_lte->resource_entry,
-		       sizeof(struct resource_entry));
+	if ((which & ~WIMLIB_CHANGE_READONLY_FLAG) == 0)
+		return 0;
+
+	ret = can_modify_wim(wim);
+	if (ret)
+		return ret;
+
+	if (which & WIMLIB_CHANGE_GUID)
+		memcpy(wim->hdr.guid, info->guid, WIM_GID_LEN);
+
+	if (which & WIMLIB_CHANGE_BOOT_INDEX) {
+		if (info->boot_index < 0 || info->boot_index > wim->hdr.image_count)
+		{
+			ERROR("%u is not 0 or a valid image in the WIM to mark as bootable",
+			      info->boot_index);
+			return WIMLIB_ERR_INVALID_IMAGE;
+		}
+		wim->hdr.boot_idx = info->boot_index;
 	}
 
+	if (which & WIMLIB_CHANGE_RPFIX_FLAG) {
+		if (info->has_rpfix)
+			wim->hdr.flags |= WIM_HDR_FLAG_RP_FIX;
+		else
+			wim->hdr.flags &= ~WIM_HDR_FLAG_RP_FIX;
+	}
 	return 0;
 }
 
+/* Deprecated */
 WIMLIBAPI int
-wimlib_get_part_number(const WIMStruct *w, int *total_parts_ret)
+wimlib_set_boot_idx(WIMStruct *wim, int boot_idx)
 {
-	if (total_parts_ret)
-		*total_parts_ret = w->hdr.total_parts;
-	return w->hdr.part_number;
+	struct wimlib_wim_info info;
+
+	info.boot_index = boot_idx;
+	return wimlib_set_wim_info(wim, &info, WIMLIB_CHANGE_BOOT_INDEX);
 }
 
+static int
+do_open_wim(const tchar *filename, int *fd_ret)
+{
+	int fd;
 
-WIMLIBAPI int
-wimlib_get_boot_idx(const WIMStruct *w)
+	fd = topen(filename, O_RDONLY | O_BINARY);
+	if (fd == -1) {
+		ERROR_WITH_ERRNO("Can't open \"%"TS"\" read-only", filename);
+		return WIMLIB_ERR_OPEN;
+	}
+	*fd_ret = fd;
+	return 0;
+}
+
+int
+reopen_wim(WIMStruct *w)
 {
-	return w->hdr.boot_idx;
+	wimlib_assert(w->in_fd == -1);
+	return do_open_wim(w->filename, &w->in_fd);
+}
+
+int
+close_wim(WIMStruct *w)
+{
+	if (w->in_fd != -1) {
+		close(w->in_fd);
+		w->in_fd = -1;
+	}
+	return 0;
 }
 
 /*
@@ -460,12 +511,9 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
 
 	DEBUG("Reading the WIM file `%"TS"'", in_wim_path);
 
-	w->fp = tfopen(in_wim_path, T("rb"));
-	if (!w->fp) {
-		ERROR_WITH_ERRNO("Failed to open `%"TS"' for reading",
-				 in_wim_path);
-		return WIMLIB_ERR_OPEN;
-	}
+	ret = do_open_wim(in_wim_path, &w->in_fd);
+	if (ret)
+		return ret;
 
 	/* The absolute path to the WIM is requested so that wimlib_overwrite()
 	 * still works even if the process changes its working directory.  This
@@ -488,10 +536,28 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
 			return WIMLIB_ERR_OPEN;
 	}
 
-	ret = read_header(w->fp, &w->hdr, open_flags);
-	if (ret != 0)
+	ret = read_header(w->filename, w->in_fd, &w->hdr);
+	if (ret)
 		return ret;
 
+	if (w->hdr.flags & WIM_HDR_FLAG_WRITE_IN_PROGRESS) {
+		WARNING("The WIM_HDR_FLAG_WRITE_IN_PROGRESS is set in the header of \"%"TS"\".\n"
+			"          It may be being changed by another process, or a process\n"
+			"          may have crashed while writing the WIM.", in_wim_path);
+	}
+
+	if (open_flags & WIMLIB_OPEN_FLAG_WRITE_ACCESS) {
+		ret = can_modify_wim(w);
+		if (ret)
+			return ret;
+	}
+
+	if (w->hdr.total_parts != 1 && !(open_flags & WIMLIB_OPEN_FLAG_SPLIT_OK)) {
+		ERROR("\"%"TS"\": This WIM is part %u of a %u-part WIM",
+		      in_wim_path, w->hdr.part_number, w->hdr.total_parts);
+		return WIMLIB_ERR_SPLIT_UNSUPPORTED;
+	}
+
 	DEBUG("According to header, WIM contains %u images", w->hdr.image_count);
 
 	/* If the boot index is invalid, print a warning and set it to 0 */
@@ -502,10 +568,25 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
 		w->hdr.boot_idx = 0;
 	}
 
-	if (wimlib_get_compression_type(w) == WIMLIB_COMPRESSION_TYPE_INVALID) {
-		ERROR("Invalid compression type (WIM header flags = 0x%x)",
-		      w->hdr.flags);
-		return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
+	/* Check and cache the compression type */
+	if (w->hdr.flags & WIM_HDR_FLAG_COMPRESSION) {
+		if (w->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZX) {
+			if (w->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
+				ERROR("Multiple compression flags are set in \"%"TS"\"",
+				      in_wim_path);
+				return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
+			}
+			w->compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+		} else if (w->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
+			w->compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
+		} else {
+			ERROR("The compression flag is set on \"%"TS"\", but "
+			      "neither the XPRESS nor LZX flag is set",
+			      in_wim_path);
+			return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
+		}
+	} else {
+		BUILD_BUG_ON(WIMLIB_COMPRESSION_TYPE_NONE != 0);
 	}
 
 	if (open_flags & WIMLIB_OPEN_FLAG_CHECK_INTEGRITY) {
@@ -521,55 +602,18 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
 		}
 	}
 
-	ret = read_lookup_table(w);
-	if (ret != 0)
-		return ret;
-
-	if (w->hdr.image_count != 0) {
-		w->image_metadata = CALLOC(w->hdr.image_count,
-					   sizeof(struct wim_image_metadata));
-
-		if (!w->image_metadata) {
-			ERROR("Failed to allocate memory for %u image metadata structures",
-			      w->hdr.image_count);
+	if (w->hdr.image_count != 0 && w->hdr.part_number == 1) {
+		w->image_metadata = new_image_metadata_array(w->hdr.image_count);
+		if (!w->image_metadata)
 			return WIMLIB_ERR_NOMEM;
-		}
 	}
-	w->current_image = 0;
 
-	DEBUG("Looking for metadata resources in the lookup table.");
-
-	/* Find the images in the WIM by searching the lookup table. */
-	ret = for_lookup_table_entry(w->lookup_table,
-	  			     append_metadata_resource_entry, w);
-
-	if (ret != 0)
+	ret = read_lookup_table(w);
+	if (ret)
 		return ret;
 
-	/* Make sure all the expected images were found.  (We already have
-	 * returned WIMLIB_ERR_IMAGE_COUNT if *extra* images were found) */
-	if (w->current_image != w->hdr.image_count &&
-	    w->hdr.part_number == 1)
-	{
-		ERROR("Only found %d images in WIM, but expected %u",
-		      w->current_image, w->hdr.image_count);
-		return WIMLIB_ERR_IMAGE_COUNT;
-	}
-
-	/* Sort images by the position of their metadata resources.  I'm
-	 * assuming that is what determines the other of the images in the WIM
-	 * file, rather than their order in the lookup table, which is random
-	 * because of hashing. */
-	qsort(w->image_metadata, w->current_image,
-	      sizeof(struct wim_image_metadata), sort_image_metadata_by_position);
-
-	w->current_image = WIMLIB_NO_IMAGE;
-
-	/* Read the XML data. */
-	ret = read_xml_data(w->fp, &w->hdr.xml_res_entry,
-			    &w->xml_data, &w->wim_info);
-
-	if (ret != 0)
+	ret = read_xml_data(w->in_fd, &w->hdr.xml_res_entry, &w->wim_info);
+	if (ret)
 		return ret;
 
 	xml_num_images = wim_info_get_num_images(w->wim_info);
@@ -590,40 +634,213 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
  */
 WIMLIBAPI int
 wimlib_open_wim(const tchar *wim_file, int open_flags,
-		WIMStruct **w_ret,
+		WIMStruct **wim_ret,
 		wimlib_progress_func_t progress_func)
 {
-	WIMStruct *w;
+	WIMStruct *wim;
 	int ret;
 
-	if (!wim_file || !w_ret)
-		return WIMLIB_ERR_INVALID_PARAM;
+	wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
 
-	w = new_wim_struct();
-	if (!w)
-		return WIMLIB_ERR_NOMEM;
+	ret = WIMLIB_ERR_INVALID_PARAM;
+	if (!wim_file || !wim_ret)
+		goto out;
 
-	ret = begin_read(w, wim_file, open_flags, progress_func);
-	if (ret == 0)
-		*w_ret = w;
-	else
-		wimlib_free(w);
+	ret = WIMLIB_ERR_NOMEM;
+	wim = new_wim_struct();
+	if (!wim)
+		goto out;
+
+	ret = begin_read(wim, wim_file, open_flags, progress_func);
+	if (ret)
+		goto out_wimlib_free;
+
+	ret = 0;
+	*wim_ret = wim;
+	goto out;
+out_wimlib_free:
+	wimlib_free(wim);
+out:
 	return ret;
 }
 
 void
 destroy_image_metadata(struct wim_image_metadata *imd,
-		       struct wim_lookup_table *table)
+		       struct wim_lookup_table *table,
+		       bool free_metadata_lte)
 {
 	free_dentry_tree(imd->root_dentry, table);
-	free_security_data(imd->security_data);
+	imd->root_dentry = NULL;
+	free_wim_security_data(imd->security_data);
+	imd->security_data = NULL;
 
-	/* Get rid of the lookup table entry for this image's metadata resource
-	 * */
-	if (table) {
-		lookup_table_unlink(table, imd->metadata_lte);
+	if (free_metadata_lte) {
 		free_lookup_table_entry(imd->metadata_lte);
+		imd->metadata_lte = NULL;
+	}
+	if (!table) {
+		struct wim_lookup_table_entry *lte, *tmp;
+		list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
+			free_lookup_table_entry(lte);
+	}
+	INIT_LIST_HEAD(&imd->unhashed_streams);
+	INIT_LIST_HEAD(&imd->inode_list);
+#ifdef WITH_NTFS_3G
+	if (imd->ntfs_vol) {
+		do_ntfs_umount(imd->ntfs_vol);
+		imd->ntfs_vol = NULL;
+	}
+#endif
+}
+
+void
+put_image_metadata(struct wim_image_metadata *imd,
+		   struct wim_lookup_table *table)
+{
+	if (imd && --imd->refcnt == 0) {
+		destroy_image_metadata(imd, table, true);
+		FREE(imd);
+	}
+}
+
+/* Appends the specified image metadata structure to the array of image metadata
+ * for a WIM, and increments the image count. */
+int
+append_image_metadata(WIMStruct *w, struct wim_image_metadata *imd)
+{
+	struct wim_image_metadata **imd_array;
+
+	DEBUG("Reallocating image metadata array for image_count = %u",
+	      w->hdr.image_count + 1);
+	imd_array = REALLOC(w->image_metadata,
+			    sizeof(w->image_metadata[0]) * (w->hdr.image_count + 1));
+
+	if (!imd_array)
+		return WIMLIB_ERR_NOMEM;
+	w->image_metadata = imd_array;
+	imd_array[w->hdr.image_count++] = imd;
+	return 0;
+}
+
+
+struct wim_image_metadata *
+new_image_metadata(void)
+{
+	struct wim_image_metadata *imd;
+
+	imd = CALLOC(1, sizeof(*imd));
+	if (imd) {
+		imd->refcnt = 1;
+		INIT_LIST_HEAD(&imd->inode_list);
+		INIT_LIST_HEAD(&imd->unhashed_streams);
+		DEBUG("Created new image metadata (refcnt=1)");
+	} else {
+		ERROR_WITH_ERRNO("Failed to allocate new image metadata structure");
+	}
+	return imd;
+}
+
+struct wim_image_metadata **
+new_image_metadata_array(unsigned num_images)
+{
+	struct wim_image_metadata **imd_array;
+
+	DEBUG("Creating new image metadata array for %u images",
+	      num_images);
+
+	imd_array = CALLOC(num_images, sizeof(imd_array[0]));
+
+	if (!imd_array) {
+		ERROR("Failed to allocate memory for %u image metadata structures",
+		      num_images);
+		return NULL;
+	}
+	for (unsigned i = 0; i < num_images; i++) {
+		imd_array[i] = new_image_metadata();
+		if (!imd_array[i]) {
+			for (unsigned j = 0; j < i; j++)
+				put_image_metadata(imd_array[j], NULL);
+			FREE(imd_array);
+			return NULL;
+		}
+	}
+	return imd_array;
+}
+
+/* Checksum all streams that are unhashed (other than the metadata streams),
+ * merging them into the lookup table as needed.  This is a no-op unless the
+ * library has previously used to add or mount an image using the same
+ * WIMStruct. */
+int
+wim_checksum_unhashed_streams(WIMStruct *w)
+{
+	int ret;
+	for (int i = 0; i < w->hdr.image_count; i++) {
+		struct wim_lookup_table_entry *lte, *tmp;
+		struct wim_image_metadata *imd = w->image_metadata[i];
+		image_for_each_unhashed_stream_safe(lte, tmp, imd) {
+			ret = hash_unhashed_stream(lte, w->lookup_table, NULL);
+			if (ret)
+				return ret;
+		}
+	}
+	return 0;
+}
+
+/*
+ * can_modify_wim - Check if a given WIM is writeable.  This is only the case if
+ * it meets the following three conditions:
+ *
+ * 1. Write access is allowed to the underlying file (if any) at the filesystem level.
+ * 2. The WIM is not part of a spanned set.
+ * 3. The WIM_HDR_FLAG_READONLY flag is not set in the WIM header.
+ *
+ * Return value is 0 if writable; WIMLIB_ERR_WIM_IS_READONLY otherwise.
+ */
+int
+can_modify_wim(WIMStruct *wim)
+{
+	if (wim->filename) {
+		if (taccess(wim->filename, W_OK)) {
+			ERROR_WITH_ERRNO("Can't modify \"%"TS"\"", wim->filename);
+			return WIMLIB_ERR_WIM_IS_READONLY;
+		}
 	}
+	if (wim->hdr.total_parts != 1) {
+		ERROR("Cannot modify \"%"TS"\": is part of a spanned set",
+		      wim->filename);
+		return WIMLIB_ERR_WIM_IS_READONLY;
+	}
+	if (wim->hdr.flags & WIM_HDR_FLAG_READONLY) {
+		ERROR("Cannot modify \"%"TS"\": is marked read-only",
+		      wim->filename);
+		return WIMLIB_ERR_WIM_IS_READONLY;
+	}
+	return 0;
+}
+
+/*
+ * can_delete_from_wim - Check if files or images can be deleted from a given
+ * WIM file.
+ *
+ * This theoretically should be exactly the same as can_modify_wim(), but
+ * unfortunately, due to bugs in Microsoft's software that generate incorrect
+ * reference counts for some WIM resources, we need to run expensive
+ * verifications to make sure the reference counts are correct on all WIM
+ * resources.  Otherwise we might delete a WIM resource whose reference count
+ * has fallen to 0, but is actually still referenced somewhere.
+ */
+int
+can_delete_from_wim(WIMStruct *wim)
+{
+	int ret;
+
+	ret = can_modify_wim(wim);
+	if (ret)
+		return ret;
+	if (!wim->refcnts_ok)
+		wim_recalculate_refcnts(wim);
+	return 0;
 }
 
 /* Frees the memory for the WIMStruct, including all internal memory; also
@@ -635,72 +852,65 @@ wimlib_free(WIMStruct *w)
 
 	if (!w)
 		return;
-	if (w->fp)
-		fclose(w->fp);
-	if (w->out_fp)
-		fclose(w->out_fp);
-
-#ifdef WITH_FUSE
-	if (w->fp_tab) {
-		for (size_t i = 0; i < w->num_allocated_fps; i++)
-			if (w->fp_tab[i])
-				fclose(w->fp_tab[i]);
-		FREE(w->fp_tab);
-	}
-	pthread_mutex_destroy(&w->fp_tab_mutex);
-#endif
+	if (w->in_fd != -1)
+		close(w->in_fd);
+	if (w->out_fd != -1)
+		close(w->out_fd);
 
 	free_lookup_table(w->lookup_table);
 
 	FREE(w->filename);
-	FREE(w->xml_data);
 	free_wim_info(w->wim_info);
 	if (w->image_metadata) {
 		for (unsigned i = 0; i < w->hdr.image_count; i++)
-			destroy_image_metadata(&w->image_metadata[i], NULL);
+			put_image_metadata(w->image_metadata[i], NULL);
 		FREE(w->image_metadata);
 	}
-#ifdef WITH_NTFS_3G
-	if (w->ntfs_vol) {
-		DEBUG("Unmounting NTFS volume");
-		ntfs_umount(w->ntfs_vol, FALSE);
-	}
-#endif
 	FREE(w);
 	DEBUG("Freed WIMStruct");
 }
 
 static bool
-test_locale_ctype_utf8()
+test_locale_ctype_utf8(void)
 {
+#ifdef __WIN32__
+	return false;
+#else
 	char *ctype = nl_langinfo(CODESET);
 
 	return (!strstr(ctype, "UTF-8") ||
 		!strstr(ctype, "UTF8") ||
 		!strstr(ctype, "utf8") ||
 		!strstr(ctype, "utf-8"));
+#endif
 }
 
-/* Get global memory allocations out of the way, 
- * single-threaded programs like 'imagex'. */
 WIMLIBAPI int
-wimlib_global_init()
+wimlib_global_init(int init_flags)
 {
+	static bool already_inited = false;
+
+	if (already_inited)
+		return 0;
 	libxml_global_init();
-#ifdef WITH_NTFS_3G
-	libntfs3g_global_init();
-#endif
-	wimlib_mbs_is_utf8 = test_locale_ctype_utf8();
+	if (!(init_flags & WIMLIB_INIT_FLAG_ASSUME_UTF8)) {
+		wimlib_mbs_is_utf8 = test_locale_ctype_utf8();
+	#ifdef WITH_NTFS_3G
+		if (!wimlib_mbs_is_utf8)
+			libntfs3g_global_init();
+	#endif
+	}
 #ifdef __WIN32__
 	win32_global_init();
 #endif
+	already_inited = true;
 	return 0;
 }
 
 /* Free global memory allocations.  Not strictly necessary if the process using
  * wimlib is just about to exit (as is the case for 'imagex'). */
 WIMLIBAPI void
-wimlib_global_cleanup()
+wimlib_global_cleanup(void)
 {
 	libxml_global_cleanup();
 	iconv_global_cleanup();