X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount_image.c;h=04ecbfefe8d3896810c800ae2a569931c5717f7e;hp=e5d7fb98462b4fc5a853e918a82348d137f0f5ba;hb=276f9f9f9658f4a8bafd6216db46760abe8c848d;hpb=fabacee4b6205284e197f07b4fefb8e66b1c3f4f

diff --git a/src/mount_image.c b/src/mount_image.c
index e5d7fb98..04ecbfef 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -30,24 +30,32 @@
 
 #ifdef WITH_FUSE
 
-#include "sha1.h"
-#include "lookup_table.h"
-#include "xml.h"
+#ifdef __WIN32__
+#  error "FUSE mount not supported on Win32!  Please configure --without-fuse"
+#endif
+
 #include "buffer_io.h"
+#include "lookup_table.h"
+#include "sha1.h"
 #include "timestamp.h"
+#include "xml.h"
+
+#include <errno.h>
+#include <ftw.h>
 #include <limits.h>
+#include <mqueue.h>
+#include <signal.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#define FUSE_USE_VERSION 26
-#include <errno.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <sys/time.h>
-#include <fuse.h>
-#include <ftw.h>
-#include <mqueue.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
 #include <utime.h>
-#include <signal.h>
+
+#define FUSE_USE_VERSION 26
+#include <fuse.h>
 
 #ifdef ENABLE_XATTR
 #include <attr/xattr.h>
@@ -106,9 +114,16 @@ struct wimfs_context {
 	char *daemon_to_unmount_mq_name;
 	mqd_t unmount_to_daemon_mq;
 	mqd_t daemon_to_unmount_mq;
+
+	uid_t default_uid;
+	gid_t default_gid;
+
+	int status;
+	bool have_status;
 };
 
-static void init_wimfs_context(struct wimfs_context *ctx)
+static void
+init_wimfs_context(struct wimfs_context *ctx)
 {
 	memset(ctx, 0, sizeof(*ctx));
 	ctx->unmount_to_daemon_mq = (mqd_t)-1;
@@ -116,28 +131,35 @@ static void init_wimfs_context(struct wimfs_context *ctx)
 	INIT_LIST_HEAD(&ctx->staging_list);
 }
 
-static inline struct wimfs_context *wimfs_get_context()
+#define WIMFS_CTX(fuse_ctx) ((struct wimfs_context*)(fuse_ctx)->private_data)
+
+static inline struct wimfs_context *
+wimfs_get_context()
 {
-	return (struct wimfs_context*)fuse_get_context()->private_data;
+	return WIMFS_CTX(fuse_get_context());
 }
 
-static inline WIMStruct *wimfs_get_WIMStruct()
+static inline WIMStruct *
+wimfs_get_WIMStruct()
 {
 	return wimfs_get_context()->wim;
 }
 
-static inline bool wimfs_ctx_readonly(const struct wimfs_context *ctx)
+static inline bool
+wimfs_ctx_readonly(const struct wimfs_context *ctx)
 {
 	return (ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) == 0;
 }
 
-static inline int get_lookup_flags(const struct wimfs_context *ctx)
+static inline int
+get_lookup_flags(const struct wimfs_context *ctx)
 {
 	return ctx->default_lookup_flags;
 }
 
 /* Returns nonzero if write permission is requested on the file open flags */
-static inline int flags_writable(int open_flags)
+static inline int
+flags_writable(int open_flags)
 {
 	return open_flags & (O_RDWR | O_WRONLY);
 }
@@ -153,11 +175,12 @@ static inline int flags_writable(int open_flags)
  *
  * Return 0 iff successful or error code if unsuccessful.
  */
-static int alloc_wimfs_fd(struct wim_inode *inode,
-			  u32 stream_id,
-			  struct wim_lookup_table_entry *lte,
-			  struct wimfs_fd **fd_ret,
-			  bool readonly)
+static int
+alloc_wimfs_fd(struct wim_inode *inode,
+	       u32 stream_id,
+	       struct wim_lookup_table_entry *lte,
+	       struct wimfs_fd **fd_ret,
+	       bool readonly)
 {
 	static const u16 fds_per_alloc = 8;
 	static const u16 max_fds = 0xffff;
@@ -220,7 +243,8 @@ out:
 	return ret;
 }
 
-static void inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
+static void
+inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
 {
 	wimlib_assert(inode != NULL);
 
@@ -241,7 +265,8 @@ static void inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
 	}
 }
 
-static int lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
+static int
+lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
 {
 	wimlib_assert(fd->f_lte == lte);
 
@@ -263,7 +288,8 @@ static int lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
 }
 
 /* Close a file descriptor. */
-static int close_wimfs_fd(struct wimfs_fd *fd)
+static int
+close_wimfs_fd(struct wimfs_fd *fd)
 {
 	int ret;
 	DEBUG("Closing fd (ino = %#"PRIx64", opened = %u, allocated = %u)",
@@ -280,20 +306,19 @@ static int close_wimfs_fd(struct wimfs_fd *fd)
 /*
  * Add a new dentry with a new inode to a WIM image.
  *
- * @ctx:	 Context for the mounted WIM image.
- * @path:	 Path to create the dentry at.
- * @dentry_ret:  Return the pointer to the dentry if successful.
- *
  * Returns 0 on success, or negative error number on failure.
  */
-static int create_dentry(struct wimfs_context *ctx, const char *path,
-			 struct wim_dentry **dentry_ret)
+static int
+create_dentry(struct fuse_context *fuse_ctx, const char *path,
+	      mode_t mode, int attributes, struct wim_dentry **dentry_ret)
 {
 	struct wim_dentry *parent;
 	struct wim_dentry *new;
 	const char *basename;
+	struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
+	int ret;
 
-	parent = get_parent_dentry(ctx->wim, path);
+	parent = get_parent_dentry(wimfs_ctx->wim, path);
 	if (!parent)
 		return -errno;
 
@@ -304,15 +329,30 @@ static int create_dentry(struct wimfs_context *ctx, const char *path,
 	if (get_dentry_child_with_name(parent, basename))
 		return -EEXIST;
 
-	new = new_dentry_with_inode(basename);
-	if (!new)
-		return -errno;
+	ret = new_dentry_with_inode(basename, &new);
+	if (ret)
+		return -ENOMEM;
 
 	new->d_inode->i_resolved = 1;
-	new->d_inode->i_ino = ctx->next_ino++;
+	new->d_inode->i_ino = wimfs_ctx->next_ino++;
+	new->d_inode->i_attributes = attributes;
+
+	if (wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
+		if (inode_set_unix_data(new->d_inode,
+					fuse_ctx->uid,
+					fuse_ctx->gid,
+					mode & ~fuse_ctx->umask,
+					wimfs_ctx->wim->lookup_table,
+					UNIX_DATA_ALL | UNIX_DATA_CREATE))
+		{
+			free_dentry(new);
+			return -ENOMEM;
+		}
+	}
 	dentry_add_child(parent, new);
-	hlist_add_head(&new->d_inode->i_hlist, ctx->image_inode_list);
-	*dentry_ret = new;
+	hlist_add_head(&new->d_inode->i_hlist, wimfs_ctx->image_inode_list);
+	if (dentry_ret)
+		*dentry_ret = new;
 	return 0;
 }
 
@@ -328,8 +368,9 @@ static int create_dentry(struct wimfs_context *ctx, const char *path,
  * descriptors and no references remaining, it is freed, and the corresponding
  * staging file is unlinked.
  */
-static void remove_dentry(struct wim_dentry *dentry,
-			  struct wim_lookup_table *lookup_table)
+static void
+remove_dentry(struct wim_dentry *dentry,
+	      struct wim_lookup_table *lookup_table)
 {
 	struct wim_inode *inode = dentry->d_inode;
 	struct wim_lookup_table_entry *lte;
@@ -344,27 +385,43 @@ static void remove_dentry(struct wim_dentry *dentry,
 	put_dentry(dentry);
 }
 
-/* Transfers file attributes from a struct wim_inode to a `stat' buffer.
- *
- * The lookup table entry tells us which stream in the inode we are statting.
- * For a named data stream, everything returned is the same as the unnamed data
- * stream except possibly the size and block count. */
-static int inode_to_stbuf(const struct wim_inode *inode,
-			  const struct wim_lookup_table_entry *lte,
-			  struct stat *stbuf)
+static mode_t
+inode_default_unix_mode(const struct wim_inode *inode)
 {
 	if (inode_is_symlink(inode))
-		stbuf->st_mode = S_IFLNK | 0777;
+		return S_IFLNK | 0777;
 	else if (inode_is_directory(inode))
-		stbuf->st_mode = S_IFDIR | 0755;
+		return S_IFDIR | 0777;
 	else
-		stbuf->st_mode = S_IFREG | 0755;
+		return S_IFREG | 0777;
+}
 
-	stbuf->st_ino   = (ino_t)inode->i_ino;
+/* Transfers file attributes from a struct wim_inode to a `stat' buffer.
+ *
+ * The lookup table entry tells us which stream in the inode we are statting.
+ * For a named data stream, everything returned is the same as the unnamed data
+ * stream except possibly the size and block count. */
+static int
+inode_to_stbuf(const struct wim_inode *inode,
+	       const struct wim_lookup_table_entry *lte,
+	       struct stat *stbuf)
+{
+	const struct wimfs_context *ctx = wimfs_get_context();
+
+	memset(stbuf, 0, sizeof(struct stat));
+	stbuf->st_mode = inode_default_unix_mode(inode);
+	stbuf->st_uid = ctx->default_uid;
+	stbuf->st_gid = ctx->default_gid;
+	if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
+		struct wimlib_unix_data unix_data;
+		if (inode_get_unix_data(inode, &unix_data, NULL) == 0) {
+			stbuf->st_uid = unix_data.uid;
+			stbuf->st_gid = unix_data.gid;
+			stbuf->st_mode = unix_data.mode;
+		}
+	}
+	stbuf->st_ino = (ino_t)inode->i_ino;
 	stbuf->st_nlink = inode->i_nlink;
-	stbuf->st_uid   = getuid();
-	stbuf->st_gid   = getgid();
-
 	if (lte) {
 		if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
 			struct stat native_stat;
@@ -381,13 +438,27 @@ static int inode_to_stbuf(const struct wim_inode *inode,
 		stbuf->st_size = 0;
 	}
 
-	stbuf->st_atime   = wim_timestamp_to_unix(inode->i_last_access_time);
-	stbuf->st_mtime   = wim_timestamp_to_unix(inode->i_last_write_time);
-	stbuf->st_ctime   = wim_timestamp_to_unix(inode->i_creation_time);
-	stbuf->st_blocks  = (stbuf->st_size + 511) / 512;
+#ifdef HAVE_STAT_NANOSECOND_PRECISION
+	stbuf->st_atim = wim_timestamp_to_timespec(inode->i_last_access_time);
+	stbuf->st_mtim = wim_timestamp_to_timespec(inode->i_last_write_time);
+	stbuf->st_ctim = stbuf->st_mtim;
+#else
+	stbuf->st_atime = wim_timestamp_to_unix(inode->i_last_access_time);
+	stbuf->st_mtime = wim_timestamp_to_unix(inode->i_last_write_time);
+	stbuf->st_ctime = stbuf->st_mtime;
+#endif
+	stbuf->st_blocks = (stbuf->st_size + 511) / 512;
 	return 0;
 }
 
+static void
+touch_inode(struct wim_inode *inode)
+{
+	u64 now = get_wim_timestamp();
+	inode->i_last_access_time = now;
+	inode->i_last_write_time = now;
+}
+
 /* Creates a new staging file and returns its file descriptor opened for
  * writing.
  *
@@ -400,7 +471,8 @@ static int inode_to_stbuf(const struct wim_inode *inode,
  * On success, returns the file descriptor for the staging file, opened for
  * writing.  On failure, returns -1 and sets errno.
  */
-static int create_staging_file(char **name_ret, struct wimfs_context *ctx)
+static int
+create_staging_file(char **name_ret, struct wimfs_context *ctx)
 {
 	size_t name_len;
 	char *name;
@@ -467,11 +539,12 @@ static int create_staging_file(char **name_ret, struct wimfs_context *ctx)
  *
  * Returns 0 on success or a negative error code on failure.
  */
-static int extract_resource_to_staging_dir(struct wim_inode *inode,
-					   u32 stream_id,
-					   struct wim_lookup_table_entry **lte,
-					   off_t size,
-					   struct wimfs_context *ctx)
+static int
+extract_resource_to_staging_dir(struct wim_inode *inode,
+				u32 stream_id,
+				struct wim_lookup_table_entry **lte,
+				off_t size,
+				struct wimfs_context *ctx)
 {
 	char *staging_file_name;
 	int ret;
@@ -625,7 +698,8 @@ out_delete_staging_file:
  * Creates a randomly named staging directory and saves its name in the
  * filesystem context structure.
  */
-static int make_staging_dir(struct wimfs_context *ctx, const char *user_prefix)
+static int
+make_staging_dir(struct wimfs_context *ctx, const char *user_prefix)
 {
 	static const size_t random_suffix_len = 10;
 	static const char *common_suffix = ".staging";
@@ -690,8 +764,9 @@ out:
 	return ret;
 }
 
-static int remove_file_or_directory(const char *fpath, const struct stat *sb,
-				    int typeflag, struct FTW *ftwbuf)
+static int
+remove_file_or_directory(const char *fpath, const struct stat *sb,
+			 int typeflag, struct FTW *ftwbuf)
 {
 	if (remove(fpath) == 0)
 		return 0;
@@ -704,7 +779,8 @@ static int remove_file_or_directory(const char *fpath, const struct stat *sb,
 /*
  * Deletes the staging directory and all the files contained in it.
  */
-static int delete_staging_dir(struct wimfs_context *ctx)
+static int
+delete_staging_dir(struct wimfs_context *ctx)
 {
 	int ret;
 	ret = nftw(ctx->staging_dir_name, remove_file_or_directory,
@@ -714,9 +790,10 @@ static int delete_staging_dir(struct wimfs_context *ctx)
 	return ret;
 }
 
-static void inode_update_lte_ptr(struct wim_inode *inode,
-				 struct wim_lookup_table_entry *old_lte,
-				 struct wim_lookup_table_entry *new_lte)
+static void
+inode_update_lte_ptr(struct wim_inode *inode,
+		     struct wim_lookup_table_entry *old_lte,
+		     struct wim_lookup_table_entry *new_lte)
 {
 	if (inode->i_lte == old_lte) {
 		inode->i_lte = new_lte;
@@ -730,8 +807,9 @@ static void inode_update_lte_ptr(struct wim_inode *inode,
 	}
 }
 
-static int update_lte_of_staging_file(struct wim_lookup_table_entry *lte,
-				      struct wim_lookup_table *table)
+static int
+update_lte_of_staging_file(struct wim_lookup_table_entry *lte,
+			   struct wim_lookup_table *table)
 {
 	struct wim_lookup_table_entry *duplicate_lte;
 	int ret;
@@ -758,7 +836,7 @@ static int update_lte_of_staging_file(struct wim_lookup_table_entry *lte,
 			inode_update_lte_ptr(lte->lte_inode, lte, NULL);
 			free_lookup_table_entry(lte);
 		} else {
-			wimlib_assert(&lte->file_on_disk == &lte->staging_file_name);
+			BUILD_BUG_ON(&lte->file_on_disk != &lte->staging_file_name);
 			lte->resource_entry.original_size = stbuf.st_size;
 			lte->resource_entry.size = stbuf.st_size;
 			lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
@@ -770,7 +848,8 @@ static int update_lte_of_staging_file(struct wim_lookup_table_entry *lte,
 	return 0;
 }
 
-static int inode_close_fds(struct wim_inode *inode)
+static int
+inode_close_fds(struct wim_inode *inode)
 {
 	u16 num_opened_fds = inode->i_num_opened_fds;
 	for (u16 i = 0, j = 0; j < num_opened_fds; i++) {
@@ -787,8 +866,9 @@ static int inode_close_fds(struct wim_inode *inode)
 }
 
 /* Overwrites the WIM file, with changes saved. */
-static int rebuild_wim(struct wimfs_context *ctx, int write_flags,
-		       wimlib_progress_func_t progress_func)
+static int
+rebuild_wim(struct wimfs_context *ctx, int write_flags,
+	    wimlib_progress_func_t progress_func)
 {
 	int ret;
 	struct wim_lookup_table_entry *lte, *tmp;
@@ -802,7 +882,7 @@ static int rebuild_wim(struct wimfs_context *ctx, int write_flags,
 	}
 
 	DEBUG("Calculating SHA1 checksums for all new staging files.");
-	list_for_each_entry(lte, &ctx->staging_list, staging_list) {
+	list_for_each_entry_safe(lte, tmp, &ctx->staging_list, staging_list) {
 		ret = update_lte_of_staging_file(lte, w->lookup_table);
 		if (ret != 0)
 			return ret;
@@ -815,10 +895,9 @@ static int rebuild_wim(struct wimfs_context *ctx, int write_flags,
 	return ret;
 }
 
-
-
 /* Simple function that returns the concatenation of 2 strings. */
-static char *strcat_dup(const char *s1, const char *s2, size_t max_len)
+static char *
+strcat_dup(const char *s1, const char *s2, size_t max_len)
 {
 	size_t len = strlen(s1) + strlen(s2);
 	if (len > max_len)
@@ -830,8 +909,8 @@ static char *strcat_dup(const char *s1, const char *s2, size_t max_len)
 	return p;
 }
 
-static int set_message_queue_names(struct wimfs_context *ctx,
-				   const char *mount_dir)
+static int
+set_message_queue_names(struct wimfs_context *ctx, const char *mount_dir)
 {
 	static const char *u2d_prefix = "/wimlib-unmount-to-daemon-mq";
 	static const char *d2u_prefix = "/wimlib-daemon-to-unmount-mq";
@@ -848,12 +927,9 @@ static int set_message_queue_names(struct wimfs_context *ctx,
 			return WIMLIB_ERR_NOTDIR;
 	}
 
-	p = dir_path;
-	while (*p) {
+	for (p = dir_path; *p; p++)
 		if (*p == '/')
 			*p = 0xff;
-		p++;
-	}
 
 	ctx->unmount_to_daemon_mq_name = strcat_dup(u2d_prefix, dir_path,
 						    NAME_MAX);
@@ -878,7 +954,8 @@ out_free_dir_path:
 	return ret;
 }
 
-static void free_message_queue_names(struct wimfs_context *ctx)
+static void
+free_message_queue_names(struct wimfs_context *ctx)
 {
 	FREE(ctx->unmount_to_daemon_mq_name);
 	FREE(ctx->daemon_to_unmount_mq_name);
@@ -895,41 +972,56 @@ static void free_message_queue_names(struct wimfs_context *ctx)
  * @daemon specifies whether the calling process is the filesystem daemon or the
  * unmount process.
  */
-static int open_message_queues(struct wimfs_context *ctx, bool daemon)
+static int
+open_message_queues(struct wimfs_context *ctx, bool daemon)
 {
 	int unmount_to_daemon_mq_flags = O_WRONLY | O_CREAT;
 	int daemon_to_unmount_mq_flags = O_RDONLY | O_CREAT;
+	mode_t mode;
+	mode_t orig_umask;
+	int ret;
 
-	if (daemon)
+	if (daemon) {
 		swap(unmount_to_daemon_mq_flags, daemon_to_unmount_mq_flags);
+		mode = 0600;
+	} else {
+		mode = 0666;
+	}
 
+	orig_umask = umask(0000);
 	DEBUG("Opening message queue \"%s\"", ctx->unmount_to_daemon_mq_name);
 	ctx->unmount_to_daemon_mq = mq_open(ctx->unmount_to_daemon_mq_name,
-					    unmount_to_daemon_mq_flags, 0700, NULL);
+					    unmount_to_daemon_mq_flags, mode, NULL);
 
 	if (ctx->unmount_to_daemon_mq == (mqd_t)-1) {
 		ERROR_WITH_ERRNO("mq_open()");
-		return WIMLIB_ERR_MQUEUE;
+		ret = WIMLIB_ERR_MQUEUE;
+		goto out;
 	}
 
 	DEBUG("Opening message queue \"%s\"", ctx->daemon_to_unmount_mq_name);
 	ctx->daemon_to_unmount_mq = mq_open(ctx->daemon_to_unmount_mq_name,
-					    daemon_to_unmount_mq_flags, 0700, NULL);
+					    daemon_to_unmount_mq_flags, mode, NULL);
 
 	if (ctx->daemon_to_unmount_mq == (mqd_t)-1) {
 		ERROR_WITH_ERRNO("mq_open()");
 		mq_close(ctx->unmount_to_daemon_mq);
 		mq_unlink(ctx->unmount_to_daemon_mq_name);
 		ctx->unmount_to_daemon_mq = (mqd_t)-1;
-		return WIMLIB_ERR_MQUEUE;
+		ret = WIMLIB_ERR_MQUEUE;
+		goto out;
 	}
-	return 0;
+	ret = 0;
+out:
+	umask(orig_umask);
+	return ret;
 }
 
 /* Try to determine the maximum message size of a message queue.  The return
  * value is the maximum message size, or a guess of 8192 bytes if it cannot be
  * determined. */
-static long mq_get_msgsize(mqd_t mq)
+static long
+mq_get_msgsize(mqd_t mq)
 {
 	static const char *msgsize_max_file = "/proc/sys/fs/mqueue/msgsize_max";
 	FILE *fp;
@@ -958,11 +1050,12 @@ static long mq_get_msgsize(mqd_t mq)
 	return msgsize;
 }
 
-static int get_mailbox(mqd_t mq, long needed_msgsize, long *msgsize_ret,
-		       void **mailbox_ret)
+static int
+get_mailbox(mqd_t mq, long needed_msgsize, long *msgsize_ret,
+	    void **mailbox_ret)
 {
 	long msgsize;
-	char *mailbox;
+	void *mailbox;
 
 	msgsize = mq_get_msgsize(mq);
 
@@ -982,14 +1075,16 @@ static int get_mailbox(mqd_t mq, long needed_msgsize, long *msgsize_ret,
 	return 0;
 }
 
-static void unlink_message_queues(struct wimfs_context *ctx)
+static void
+unlink_message_queues(struct wimfs_context *ctx)
 {
 	mq_unlink(ctx->unmount_to_daemon_mq_name);
 	mq_unlink(ctx->daemon_to_unmount_mq_name);
 }
 
 /* Closes the message queues, which are allocated in static variables */
-static void close_message_queues(struct wimfs_context *ctx)
+static void
+close_message_queues(struct wimfs_context *ctx)
 {
 	DEBUG("Closing message queues");
 	mq_close(ctx->unmount_to_daemon_mq);
@@ -1054,8 +1149,8 @@ struct daemon_msg_handler_context {
 	struct wimfs_context *wimfs_ctx;
 };
 
-static int send_unmount_request_msg(mqd_t mq, int unmount_flags,
-				    u8 want_progress_messages)
+static int
+send_unmount_request_msg(mqd_t mq, int unmount_flags, u8 want_progress_messages)
 {
 	DEBUG("Sending unmount request msg");
 	struct msg_unmount_request msg = {
@@ -1076,7 +1171,8 @@ static int send_unmount_request_msg(mqd_t mq, int unmount_flags,
 	return 0;
 }
 
-static int send_daemon_info_msg(mqd_t mq, pid_t pid, int mount_flags)
+static int
+send_daemon_info_msg(mqd_t mq, pid_t pid, int mount_flags)
 {
 	DEBUG("Sending daemon info msg (pid = %d, mount_flags=%x)",
 	      pid, mount_flags);
@@ -1098,7 +1194,8 @@ static int send_daemon_info_msg(mqd_t mq, pid_t pid, int mount_flags)
 	return 0;
 }
 
-static void send_unmount_finished_msg(mqd_t mq, int status)
+static void
+send_unmount_finished_msg(mqd_t mq, int status)
 {
 	DEBUG("Sending unmount finished msg");
 	struct msg_unmount_finished msg = {
@@ -1114,8 +1211,9 @@ static void send_unmount_finished_msg(mqd_t mq, int status)
 		ERROR_WITH_ERRNO("Failed to send status to unmount process");
 }
 
-static int unmount_progress_func(enum wimlib_progress_msg msg,
-				 const union wimlib_progress_info *info)
+static int
+unmount_progress_func(enum wimlib_progress_msg msg,
+		      const union wimlib_progress_info *info)
 {
 	if (msg == WIMLIB_PROGRESS_MSG_WRITE_STREAMS) {
 		struct msg_write_streams_progress msg = {
@@ -1137,7 +1235,8 @@ static int unmount_progress_func(enum wimlib_progress_msg msg,
 	return 0;
 }
 
-static int msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
+static int
+msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
 {
 	const struct msg_unmount_request *msg = _msg;
 	struct daemon_msg_handler_context *handler_ctx = _handler_ctx;
@@ -1194,11 +1293,13 @@ out:
 				status = ret;
 		}
 	}
-	send_unmount_finished_msg(wimfs_ctx->daemon_to_unmount_mq, status);
+	wimfs_ctx->status = status;
+	wimfs_ctx->have_status = true;
 	return MSG_BREAK_LOOP;
 }
 
-static int msg_daemon_info_handler(const void *_msg, void *_handler_ctx)
+static int
+msg_daemon_info_handler(const void *_msg, void *_handler_ctx)
 {
 	const struct msg_daemon_info *msg = _msg;
 	struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
@@ -1215,8 +1316,8 @@ static int msg_daemon_info_handler(const void *_msg, void *_handler_ctx)
 	return 0;
 }
 
-static int msg_write_streams_progress_handler(const void *_msg,
-					      void *_handler_ctx)
+static int
+msg_write_streams_progress_handler(const void *_msg, void *_handler_ctx)
 {
 	const struct msg_write_streams_progress *msg = _msg;
 	struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
@@ -1230,7 +1331,8 @@ static int msg_write_streams_progress_handler(const void *_msg,
 	return 0;
 }
 
-static int msg_unmount_finished_handler(const void *_msg, void *_handler_ctx)
+static int
+msg_unmount_finished_handler(const void *_msg, void *_handler_ctx)
 {
 	const struct msg_unmount_finished *msg = _msg;
 	struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
@@ -1243,7 +1345,8 @@ static int msg_unmount_finished_handler(const void *_msg, void *_handler_ctx)
 	return MSG_BREAK_LOOP;
 }
 
-static int unmount_timed_out_cb(void *_handler_ctx)
+static int
+unmount_timed_out_cb(void *_handler_ctx)
 {
 	struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
 
@@ -1266,7 +1369,8 @@ out_crashed:
 	return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
 }
 
-static int daemon_timed_out_cb(void *_handler_ctx)
+static int
+daemon_timed_out_cb(void *_handler_ctx)
 {
 	ERROR("Timed out waiting for unmount request! "
 	      "Changes to the mounted WIM will not be committed.");
@@ -1296,10 +1400,11 @@ static const struct msg_handler_callbacks daemon_msg_handler_callbacks = {
 	},
 };
 
-static int receive_message(mqd_t mq,
-			   struct msg_handler_context_hdr *handler_ctx,
-			   const msg_handler_t msg_handlers[],
-			   long mailbox_size, void *mailbox)
+static int
+receive_message(mqd_t mq,
+		struct msg_handler_context_hdr *handler_ctx,
+		const msg_handler_t msg_handlers[],
+		long mailbox_size, void *mailbox)
 {
 	struct timeval now;
 	struct timespec timeout;
@@ -1341,9 +1446,10 @@ static int receive_message(mqd_t mq,
 	return ret;
 }
 
-static int message_loop(mqd_t mq,
-			const struct msg_handler_callbacks *callbacks,
-			struct msg_handler_context_hdr *handler_ctx)
+static int
+message_loop(mqd_t mq,
+	     const struct msg_handler_callbacks *callbacks,
+	     struct msg_handler_context_hdr *handler_ctx)
 {
 	static const size_t MAX_MSG_SIZE = 512;
 	long msgsize;
@@ -1391,7 +1497,8 @@ static int message_loop(mqd_t mq,
  *  not.  However, after that, the unmount process must wait for the filesystem
  *  daemon to finish writing the WIM file.
  */
-static int execute_fusermount(const char *dir)
+static int
+execute_fusermount(const char *dir)
 {
 	pid_t pid;
 	int ret;
@@ -1461,35 +1568,59 @@ static int execute_fusermount(const char *dir)
 	return 0;
 }
 
+#if 0
 static int wimfs_access(const char *path, int mask)
 {
-	/* Permissions not implemented */
-	return 0;
+	return -ENOSYS;
 }
+#endif
 
-static int wimfs_chmod(const char *path, mode_t mask)
+static int
+wimfs_chmod(const char *path, mode_t mask)
 {
 	struct wim_dentry *dentry;
 	struct wimfs_context *ctx = wimfs_get_context();
-	struct wim_inode *inode;
-	struct stat stbuf;
 	int ret;
 
-	ret = lookup_resource(ctx->wim, path,
-			      get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK,
+	if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
+		return -EPERM;
+
+	ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
 			      &dentry, NULL, NULL);
-	if (ret != 0)
+	if (ret)
 		return ret;
-	inode = dentry->d_inode;
-	inode_to_stbuf(inode, NULL, &stbuf);
-	if (mask == stbuf.st_mode)
-		return 0;
-	else
+
+	ret = inode_set_unix_data(dentry->d_inode, ctx->default_uid,
+				  ctx->default_gid, mask,
+				  ctx->wim->lookup_table, UNIX_DATA_MODE);
+	return ret ? -ENOMEM : 0;
+}
+
+static int
+wimfs_chown(const char *path, uid_t uid, gid_t gid)
+{
+	struct wim_dentry *dentry;
+	struct wimfs_context *ctx = wimfs_get_context();
+	int ret;
+
+	if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
 		return -EPERM;
+
+	ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
+			      &dentry, NULL, NULL);
+	if (ret)
+		return ret;
+
+	ret = inode_set_unix_data(dentry->d_inode, uid, gid,
+				  inode_default_unix_mode(dentry->d_inode),
+				  ctx->wim->lookup_table,
+				  UNIX_DATA_UID | UNIX_DATA_GID);
+	return ret ? -ENOMEM : 0;
 }
 
 /* Called when the filesystem is unmounted. */
-static void wimfs_destroy(void *p)
+static void
+wimfs_destroy(void *p)
 {
 	struct wimfs_context *wimfs_ctx = wimfs_get_context();
 	if (open_message_queues(wimfs_ctx, true) == 0) {
@@ -1502,7 +1633,6 @@ static void wimfs_destroy(void *p)
 		message_loop(wimfs_ctx->unmount_to_daemon_mq,
 			     &daemon_msg_handler_callbacks,
 			     &handler_ctx.hdr);
-		close_message_queues(wimfs_ctx);
 	}
 }
 
@@ -1517,15 +1647,16 @@ static int wimfs_fallocate(const char *path, int mode,
 
 #endif
 
-static int wimfs_fgetattr(const char *path, struct stat *stbuf,
-			  struct fuse_file_info *fi)
+static int
+wimfs_fgetattr(const char *path, struct stat *stbuf,
+	       struct fuse_file_info *fi)
 {
 	struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	return inode_to_stbuf(fd->f_inode, fd->f_lte, stbuf);
 }
 
-static int wimfs_ftruncate(const char *path, off_t size,
-			   struct fuse_file_info *fi)
+static int
+wimfs_ftruncate(const char *path, off_t size, struct fuse_file_info *fi)
 {
 	struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	int ret = ftruncate(fd->staging_fd, size);
@@ -1539,7 +1670,8 @@ static int wimfs_ftruncate(const char *path, off_t size,
 /*
  * Fills in a `struct stat' that corresponds to a file or directory in the WIM.
  */
-static int wimfs_getattr(const char *path, struct stat *stbuf)
+static int
+wimfs_getattr(const char *path, struct stat *stbuf)
 {
 	struct wim_dentry *dentry;
 	struct wim_lookup_table_entry *lte;
@@ -1556,8 +1688,9 @@ static int wimfs_getattr(const char *path, struct stat *stbuf)
 
 #ifdef ENABLE_XATTR
 /* Read an alternate data stream through the XATTR interface, or get its size */
-static int wimfs_getxattr(const char *path, const char *name, char *value,
-			  size_t size)
+static int
+wimfs_getxattr(const char *path, const char *name, char *value,
+	       size_t size)
 {
 	int ret;
 	struct wim_inode *inode;
@@ -1600,7 +1733,8 @@ static int wimfs_getxattr(const char *path, const char *name, char *value,
 #endif
 
 /* Create a hard link */
-static int wimfs_link(const char *to, const char *from)
+static int
+wimfs_link(const char *to, const char *from)
 {
 	struct wim_dentry *from_dentry, *from_dentry_parent;
 	const char *link_name;
@@ -1608,29 +1742,29 @@ static int wimfs_link(const char *to, const char *from)
 	struct wim_lookup_table_entry *lte;
 	WIMStruct *w = wimfs_get_WIMStruct();
 	u16 i;
+	int ret;
 
 	inode = wim_pathname_to_inode(w, to);
 	if (!inode)
 		return -errno;
 
-	if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)
-		return -EEXIST;
-
-	if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY)
+	if (inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
+				   FILE_ATTRIBUTE_REPARSE_POINT))
 		return -EPERM;
 
 	from_dentry_parent = get_parent_dentry(w, from);
 	if (!from_dentry_parent)
-		return -ENOENT;
+		return -errno;
 	if (!dentry_is_directory(from_dentry_parent))
 		return -ENOTDIR;
 
 	link_name = path_basename(from);
 	if (get_dentry_child_with_name(from_dentry_parent, link_name))
 		return -EEXIST;
-	from_dentry = new_dentry(link_name);
-	if (!from_dentry)
-		return -errno;
+
+	ret = new_dentry(link_name, &from_dentry);
+	if (ret)
+		return -ENOMEM;
 
 	inode_add_dentry(from_dentry, inode);
 	from_dentry->d_inode = inode;
@@ -1646,13 +1780,15 @@ static int wimfs_link(const char *to, const char *from)
 }
 
 #ifdef ENABLE_XATTR
-static int wimfs_listxattr(const char *path, char *list, size_t size)
+static int
+wimfs_listxattr(const char *path, char *list, size_t size)
 {
 	size_t needed_size;
 	struct wim_inode *inode;
 	struct wimfs_context *ctx = wimfs_get_context();
 	u16 i;
 	char *p;
+	bool size_only = (size == 0);
 
 	if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
 		return -ENOTSUP;
@@ -1663,47 +1799,56 @@ static int wimfs_listxattr(const char *path, char *list, size_t size)
 	if (!inode)
 		return -errno;
 
-	if (size == 0) {
-		needed_size = 0;
-		for (i = 0; i < inode->i_num_ads; i++)
-			needed_size += inode->i_ads_entries[i].stream_name_utf8_len + 6;
-		return needed_size;
-	} else {
-		p = list;
-		for (i = 0; i < inode->i_num_ads; i++) {
-			needed_size = inode->i_ads_entries[i].stream_name_utf8_len + 6;
-			if (needed_size > size)
+	p = list;
+	for (i = 0; i < inode->i_num_ads; i++) {
+		char *stream_name_mbs;
+		size_t stream_name_mbs_nbytes;
+		int ret;
+
+		ret = utf16le_to_mbs(inode->i_ads_entries[i].stream_name,
+				     inode->i_ads_entries[i].stream_name_nbytes,
+				     &stream_name_mbs,
+				     &stream_name_mbs_nbytes);
+		if (ret)
+			return -errno;
+
+		needed_size = stream_name_mbs_nbytes + 6;
+		if (!size_only) {
+			if (needed_size > size) {
+				FREE(stream_name_mbs);
 				return -ERANGE;
-			p += sprintf(p, "user.%s",
-				     inode->i_ads_entries[i].stream_name_utf8) + 1;
+			}
+			sprintf(p, "user.%s", stream_name_mbs);
 			size -= needed_size;
 		}
-		return p - list;
+		p += needed_size;
+		FREE(stream_name_mbs);
 	}
+	return p - list;
 }
 #endif
 
 
-/* Create a directory in the WIM.
- * @mode is currently ignored.  */
-static int wimfs_mkdir(const char *path, mode_t mode)
+/* Create a directory in the WIM image. */
+static int
+wimfs_mkdir(const char *path, mode_t mode)
 {
-	struct wim_dentry *dentry;
-	int ret;
-
-	ret = create_dentry(wimfs_get_context(), path, &dentry);
-	if (ret == 0)
-		dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
-	return ret;
+	return create_dentry(fuse_get_context(), path, mode | S_IFDIR,
+			     FILE_ATTRIBUTE_DIRECTORY, NULL);
 }
 
-/* Create a regular file in the WIM.
- * @mode is currently ignored.  */
-static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
+/* Create a regular file or alternate data stream in the WIM image. */
+static int
+wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 {
 	const char *stream_name;
-	struct wimfs_context *ctx = wimfs_get_context();
-	if ((ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
+	struct fuse_context *fuse_ctx = fuse_get_context();
+	struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
+
+	if (!S_ISREG(mode))
+		return -EPERM;
+
+	if ((wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
 	     && (stream_name = path_stream_name(path))) {
 		/* Make an alternate data stream */
 		struct wim_ads_entry *new_entry;
@@ -1713,7 +1858,7 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 		wimlib_assert(*p == ':');
 		*p = '\0';
 
-		inode = wim_pathname_to_inode(ctx->wim, path);
+		inode = wim_pathname_to_inode(wimfs_ctx->wim, path);
 		if (!inode)
 			return -errno;
 		if (inode->i_attributes &
@@ -1726,20 +1871,15 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 			return -ENOMEM;
 		return 0;
 	} else {
-		struct wim_dentry *dentry;
-		int ret;
-
 		/* Make a normal file (not an alternate data stream) */
-		ret = create_dentry(ctx, path, &dentry);
-		if (ret == 0)
-			dentry->d_inode->i_attributes = FILE_ATTRIBUTE_NORMAL;
-		return ret;
+		return create_dentry(fuse_ctx, path, mode | S_IFREG,
+				     FILE_ATTRIBUTE_NORMAL, NULL);
 	}
 }
 
-
 /* Open a file.  */
-static int wimfs_open(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_open(const char *path, struct fuse_file_info *fi)
 {
 	struct wim_dentry *dentry;
 	struct wim_lookup_table_entry *lte;
@@ -1779,7 +1919,7 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 	}
 
 	ret = alloc_wimfs_fd(inode, stream_id, lte, &fd,
-			      wimfs_ctx_readonly(ctx));
+			     wimfs_ctx_readonly(ctx));
 	if (ret != 0)
 		return ret;
 
@@ -1796,7 +1936,8 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 }
 
 /* Opens a directory. */
-static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_opendir(const char *path, struct fuse_file_info *fi)
 {
 	struct wim_inode *inode;
 	int ret;
@@ -1818,8 +1959,9 @@ static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
 /*
  * Read data from a file in the WIM or in the staging directory.
  */
-static int wimfs_read(const char *path, char *buf, size_t size,
-		      off_t offset, struct fuse_file_info *fi)
+static int
+wimfs_read(const char *path, char *buf, size_t size,
+	   off_t offset, struct fuse_file_info *fi)
 {
 	struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	ssize_t ret;
@@ -1850,7 +1992,7 @@ static int wimfs_read(const char *path, char *buf, size_t size,
 		if (offset > res_size)
 			return -EOVERFLOW;
 		size = min(size, res_size - offset);
-		if (read_wim_resource(fd->f_lte, (u8*)buf,
+		if (read_wim_resource(fd->f_lte, buf,
 				      size, offset,
 				      WIMLIB_RESOURCE_FLAG_MULTITHREADED) != 0)
 			return -EIO;
@@ -1863,17 +2005,32 @@ struct fill_params {
 	fuse_fill_dir_t filler;
 };
 
-static int dentry_fuse_fill(struct wim_dentry *dentry, void *arg)
+static int
+dentry_fuse_fill(struct wim_dentry *dentry, void *arg)
 {
 	struct fill_params *fill_params = arg;
-	return fill_params->filler(fill_params->buf, dentry->file_name_utf8,
-				   NULL, 0);
+
+	char *file_name_mbs;
+	size_t file_name_mbs_nbytes;
+	int ret;
+
+	ret = utf16le_to_mbs(dentry->file_name,
+			     dentry->file_name_nbytes,
+			     &file_name_mbs,
+			     &file_name_mbs_nbytes);
+	if (ret)
+		return -errno;
+
+	ret = fill_params->filler(fill_params->buf, file_name_mbs, NULL, 0);
+	FREE(file_name_mbs);
+	return ret;
 }
 
 /* Fills in the entries of the directory specified by @path using the
  * FUSE-provided function @filler.  */
-static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
-			 off_t offset, struct fuse_file_info *fi)
+static int
+wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+	      off_t offset, struct fuse_file_info *fi)
 {
 	struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	struct wim_inode *inode;
@@ -1896,7 +2053,8 @@ static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 }
 
 
-static int wimfs_readlink(const char *path, char *buf, size_t buf_len)
+static int
+wimfs_readlink(const char *path, char *buf, size_t buf_len)
 {
 	struct wimfs_context *ctx = wimfs_get_context();
 	struct wim_inode *inode = wim_pathname_to_inode(ctx->wim, path);
@@ -1914,14 +2072,16 @@ static int wimfs_readlink(const char *path, char *buf, size_t buf_len)
 }
 
 /* Close a file. */
-static int wimfs_release(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_release(const char *path, struct fuse_file_info *fi)
 {
 	struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	return close_wimfs_fd(fd);
 }
 
 /* Close a directory */
-static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_releasedir(const char *path, struct fuse_file_info *fi)
 {
 	struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	return close_wimfs_fd(fd);
@@ -1929,7 +2089,8 @@ static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
 
 #ifdef ENABLE_XATTR
 /* Remove an alternate data stream through the XATTR interface */
-static int wimfs_removexattr(const char *path, const char *name)
+static int
+wimfs_removexattr(const char *path, const char *name)
 {
 	struct wim_inode *inode;
 	struct wim_ads_entry *ads_entry;
@@ -1956,7 +2117,8 @@ static int wimfs_removexattr(const char *path, const char *name)
 #endif
 
 /* Renames a file or directory.  See rename (3) */
-static int wimfs_rename(const char *from, const char *to)
+static int
+wimfs_rename(const char *from, const char *to)
 {
 	struct wim_dentry *src;
 	struct wim_dentry *dst;
@@ -2013,9 +2175,10 @@ static int wimfs_rename(const char *from, const char *to)
 }
 
 /* Remove a directory */
-static int wimfs_rmdir(const char *path)
+static int
+wimfs_rmdir(const char *path)
 {
-	struct wim_dentry *parent, *dentry;
+	struct wim_dentry *dentry;
 	WIMStruct *w = wimfs_get_WIMStruct();
 
 	dentry = get_dentry(w, path);
@@ -2034,17 +2197,15 @@ static int wimfs_rmdir(const char *path)
 
 #ifdef ENABLE_XATTR
 /* Write an alternate data stream through the XATTR interface */
-static int wimfs_setxattr(const char *path, const char *name,
-			  const char *value, size_t size, int flags)
+static int
+wimfs_setxattr(const char *path, const char *name,
+	       const char *value, size_t size, int flags)
 {
 	struct wim_ads_entry *existing_ads_entry;
-	struct wim_ads_entry *new_ads_entry;
-	struct wim_lookup_table_entry *existing_lte;
-	struct wim_lookup_table_entry *lte;
 	struct wim_inode *inode;
-	u8 value_hash[SHA1_HASH_SIZE];
 	u16 ads_idx;
 	struct wimfs_context *ctx = wimfs_get_context();
+	int ret;
 
 	if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
 		return -ENOTSUP;
@@ -2061,61 +2222,39 @@ static int wimfs_setxattr(const char *path, const char *name,
 	if (existing_ads_entry) {
 		if (flags & XATTR_CREATE)
 			return -EEXIST;
-		inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table);
 	} else {
 		if (flags & XATTR_REPLACE)
 			return -ENOATTR;
 	}
-	new_ads_entry = inode_add_ads(inode, name);
-	if (!new_ads_entry)
-		return -ENOMEM;
-
-	sha1_buffer((const u8*)value, size, value_hash);
-
-	existing_lte = __lookup_resource(ctx->wim->lookup_table, value_hash);
 
-	if (existing_lte) {
-		lte = existing_lte;
-		lte->refcnt++;
+	ret = inode_add_ads_with_data(inode, name, value,
+				      size, ctx->wim->lookup_table);
+	if (ret == 0) {
+		if (existing_ads_entry)
+			inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table);
 	} else {
-		u8 *value_copy;
-		lte = new_lookup_table_entry();
-		if (!lte)
-			return -ENOMEM;
-		value_copy = MALLOC(size);
-		if (!value_copy) {
-			FREE(lte);
-			return -ENOMEM;
-		}
-		memcpy(value_copy, value, size);
-		lte->resource_location            = RESOURCE_IN_ATTACHED_BUFFER;
-		lte->attached_buffer              = value_copy;
-		lte->resource_entry.original_size = size;
-		lte->resource_entry.size          = size;
-		lte->resource_entry.flags         = 0;
-		copy_hash(lte->hash, value_hash);
-		lookup_table_insert(ctx->wim->lookup_table, lte);
-	}
-	new_ads_entry->lte = lte;
-	return 0;
+		ret = -ENOMEM;
+	}
+	return ret;
 }
 #endif
 
-static int wimfs_symlink(const char *to, const char *from)
+static int
+wimfs_symlink(const char *to, const char *from)
 {
-	struct wimfs_context *ctx = wimfs_get_context();
+	struct fuse_context *fuse_ctx = fuse_get_context();
+	struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
 	struct wim_dentry *dentry;
 	int ret;
 
-	ret = create_dentry(ctx, from, &dentry);
+	ret = create_dentry(fuse_ctx, from, S_IFLNK | 0777,
+			    FILE_ATTRIBUTE_REPARSE_POINT, &dentry);
 	if (ret == 0) {
-		dentry->d_inode->i_attributes = FILE_ATTRIBUTE_REPARSE_POINT;
 		dentry->d_inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
 		if (inode_set_symlink(dentry->d_inode, to,
-				      ctx->wim->lookup_table, NULL))
+				      wimfs_ctx->wim->lookup_table, NULL))
 		{
-			unlink_dentry(dentry);
-			free_dentry(dentry);
+			remove_dentry(dentry, wimfs_ctx->wim->lookup_table);
 			ret = -ENOMEM;
 		}
 	}
@@ -2124,7 +2263,8 @@ static int wimfs_symlink(const char *to, const char *from)
 
 
 /* Reduce the size of a file */
-static int wimfs_truncate(const char *path, off_t size)
+static int
+wimfs_truncate(const char *path, off_t size)
 {
 	struct wim_dentry *dentry;
 	struct wim_lookup_table_entry *lte;
@@ -2163,7 +2303,8 @@ static int wimfs_truncate(const char *path, off_t size)
 }
 
 /* Unlink a non-directory or alternate data stream */
-static int wimfs_unlink(const char *path)
+static int
+wimfs_unlink(const char *path)
 {
 	struct wim_dentry *dentry;
 	struct wim_lookup_table_entry *lte;
@@ -2191,7 +2332,8 @@ static int wimfs_unlink(const char *path)
  *
  * Note that alternate data streams do not have their own timestamps.
  */
-static int wimfs_utimens(const char *path, const struct timespec tv[2])
+static int
+wimfs_utimens(const char *path, const struct timespec tv[2])
 {
 	struct wim_dentry *dentry;
 	struct wim_inode *inode;
@@ -2206,18 +2348,19 @@ static int wimfs_utimens(const char *path, const struct timespec tv[2])
 		if (tv[0].tv_nsec == UTIME_NOW)
 			inode->i_last_access_time = get_wim_timestamp();
 		else
-			inode->i_last_access_time = timespec_to_wim_timestamp(&tv[0]);
+			inode->i_last_access_time = timespec_to_wim_timestamp(tv[0]);
 	}
 	if (tv[1].tv_nsec != UTIME_OMIT) {
 		if (tv[1].tv_nsec == UTIME_NOW)
 			inode->i_last_write_time = get_wim_timestamp();
 		else
-			inode->i_last_write_time = timespec_to_wim_timestamp(&tv[1]);
+			inode->i_last_write_time = timespec_to_wim_timestamp(tv[1]);
 	}
 	return 0;
 }
-#else
-static int wimfs_utime(const char *path, struct utimbuf *times)
+#else /* HAVE_UTIMENSAT */
+static int
+wimfs_utime(const char *path, struct utimbuf *times)
 {
 	struct wim_dentry *dentry;
 	struct wim_inode *inode;
@@ -2232,17 +2375,17 @@ static int wimfs_utime(const char *path, struct utimbuf *times)
 	inode->i_last_access_time = unix_timestamp_to_wim(times->actime);
 	return 0;
 }
-#endif
+#endif /* !HAVE_UTIMENSAT */
 
 /* Writes to a file in the WIM filesystem.
  * It may be an alternate data stream, but here we don't even notice because we
  * just get a lookup table entry. */
-static int wimfs_write(const char *path, const char *buf, size_t size,
-		       off_t offset, struct fuse_file_info *fi)
+static int
+wimfs_write(const char *path, const char *buf, size_t size,
+	    off_t offset, struct fuse_file_info *fi)
 {
 	struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	int ret;
-	u64 now;
 
 	if (!fd)
 		return -EBADF;
@@ -2261,15 +2404,17 @@ static int wimfs_write(const char *path, const char *buf, size_t size,
 	if (ret == -1)
 		return -errno;
 
-	now = get_wim_timestamp();
-	fd->f_inode->i_last_write_time = now;
-	fd->f_inode->i_last_access_time = now;
+	/* Update timestamps */
+	touch_inode(fd->f_inode);
 	return ret;
 }
 
 static struct fuse_operations wimfs_operations = {
+#if 0
 	.access      = wimfs_access,
+#endif
 	.chmod       = wimfs_chmod,
+	.chown       = wimfs_chown,
 	.destroy     = wimfs_destroy,
 #if 0
 	.fallocate   = wimfs_fallocate,
@@ -2325,12 +2470,13 @@ static struct fuse_operations wimfs_operations = {
 
 
 /* Mounts an image from a WIM file. */
-WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
-				 int mount_flags, WIMStruct **additional_swms,
-				 unsigned num_additional_swms,
-				 const char *staging_dir)
+WIMLIBAPI int
+wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
+		   int mount_flags, WIMStruct **additional_swms,
+		   unsigned num_additional_swms,
+		   const char *staging_dir)
 {
-	int argc = 0;
+	int argc;
 	char *argv[16];
 	int ret;
 	char *dir_copy;
@@ -2414,7 +2560,8 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	ctx.wim = wim;
 	ctx.mount_flags = mount_flags;
 	ctx.image_inode_list = &imd->inode_list;
-
+	ctx.default_uid = getuid();
+	ctx.default_gid = getgid();
 	if (mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
 		ctx.default_lookup_flags = LOOKUP_FLAG_ADS_OK;
 
@@ -2430,6 +2577,7 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	if (!dir_copy)
 		goto out_free_message_queue_names;
 
+	argc = 0;
 	argv[argc++] = "imagex";
 	argv[argc++] = dir_copy;
 
@@ -2450,6 +2598,7 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 #if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 8)
 		",hard_remove"
 #endif
+		",default_permissions"
 		;
 	argv[argc++] = "-o";
 	argv[argc++] = optstring;
@@ -2462,6 +2611,8 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 		/* Read-only mount */
 		strcat(optstring, ",ro");
 	}
+	if (mount_flags & WIMLIB_MOUNT_FLAG_ALLOW_OTHER)
+		strcat(optstring, ",allow_other");
 	argv[argc] = NULL;
 
 #ifdef ENABLE_DEBUG
@@ -2499,8 +2650,23 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 
 	DEBUG("Returned from fuse_main() (ret = %d)", ret);
 
-	if (ret)
+	if (ret) {
 		ret = WIMLIB_ERR_FUSE;
+	} else {
+		if (ctx.have_status)
+			ret = ctx.status;
+		else
+			ret = WIMLIB_ERR_TIMEOUT;
+	}
+	if (ctx.daemon_to_unmount_mq != (mqd_t)(-1)) {
+		send_unmount_finished_msg(ctx.daemon_to_unmount_mq, ret);
+		close_message_queues(&ctx);
+	}
+
+	/* Try to delete the staging directory if a deletion wasn't yet
+	 * attempted due to an earlier error */
+	if (ctx.staging_dir_name)
+		delete_staging_dir(&ctx);
 out_free_dir_copy:
 	FREE(dir_copy);
 out_unlock:
@@ -2519,8 +2685,9 @@ out:
  * Unmounts the WIM file that was previously mounted on @dir by using
  * wimlib_mount_image().
  */
-WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags,
-				   wimlib_progress_func_t progress_func)
+WIMLIBAPI int
+wimlib_unmount_image(const char *dir, int unmount_flags,
+		     wimlib_progress_func_t progress_func)
 {
 	int ret;
 	struct wimfs_context wimfs_ctx;
@@ -2569,25 +2736,32 @@ out:
 #else /* WITH_FUSE */
 
 
-static inline int mount_unsupported_error()
+static int
+mount_unsupported_error()
 {
+#if defined(__WIN32__)
+	ERROR("Sorry-- Mounting WIM images is not supported on Windows!");
+#else
 	ERROR("wimlib was compiled with --without-fuse, which disables support "
 	      "for mounting WIMs.");
+#endif
 	return WIMLIB_ERR_UNSUPPORTED;
 }
 
-WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags,
-				   wimlib_progress_func_t progress_func)
+WIMLIBAPI int
+wimlib_unmount_image(const tchar *dir, int unmount_flags,
+		     wimlib_progress_func_t progress_func)
 {
 	return mount_unsupported_error();
 }
 
-WIMLIBAPI int wimlib_mount_image(WIMStruct *wim_p, int image, const char *dir,
-				 int mount_flags, WIMStruct **additional_swms,
-				 unsigned num_additional_swms,
-				 const char *staging_dir)
+WIMLIBAPI int
+wimlib_mount_image(WIMStruct *wim, int image, const tchar *dir,
+		   int mount_flags, WIMStruct **additional_swms,
+		   unsigned num_additional_swms,
+		   const tchar *staging_dir)
 {
 	return mount_unsupported_error();
 }
 
-#endif /* WITH_FUSE */
+#endif /* !WITH_FUSE */