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

diff --git a/src/mount_image.c b/src/mount_image.c
index afb09050..04ecbfef 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -30,6 +30,10 @@
 
 #ifdef WITH_FUSE
 
+#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"
@@ -118,7 +122,8 @@ struct wimfs_context {
 	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;
@@ -128,28 +133,33 @@ static void init_wimfs_context(struct wimfs_context *ctx)
 
 #define WIMFS_CTX(fuse_ctx) ((struct wimfs_context*)(fuse_ctx)->private_data)
 
-static inline struct wimfs_context *wimfs_get_context()
+static inline struct wimfs_context *
+wimfs_get_context()
 {
 	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);
 }
@@ -165,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;
@@ -232,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);
 
@@ -253,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);
 
@@ -275,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)",
@@ -294,14 +308,15 @@ static int close_wimfs_fd(struct wimfs_fd *fd)
  *
  * Returns 0 on success, or negative error number on failure.
  */
-static int create_dentry(struct fuse_context *fuse_ctx,const char *path,
-			 mode_t mode, int attributes,
-			 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(wimfs_ctx->wim, path);
 	if (!parent)
@@ -314,9 +329,9 @@ static int create_dentry(struct fuse_context *fuse_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 = wimfs_ctx->next_ino++;
@@ -353,8 +368,9 @@ static int create_dentry(struct fuse_context *fuse_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;
@@ -369,7 +385,8 @@ static void remove_dentry(struct wim_dentry *dentry,
 	put_dentry(dentry);
 }
 
-static mode_t inode_default_unix_mode(const struct wim_inode *inode)
+static mode_t
+inode_default_unix_mode(const struct wim_inode *inode)
 {
 	if (inode_is_symlink(inode))
 		return S_IFLNK | 0777;
@@ -384,9 +401,10 @@ static mode_t inode_default_unix_mode(const struct wim_inode *inode)
  * 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 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();
 
@@ -420,13 +438,27 @@ static int inode_to_stbuf(const struct wim_inode *inode,
 		stbuf->st_size = 0;
 	}
 
+#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 = wim_timestamp_to_unix(inode->i_creation_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.
  *
@@ -439,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;
@@ -506,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;
@@ -664,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";
@@ -729,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;
@@ -743,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,
@@ -753,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;
@@ -769,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;
@@ -809,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++) {
@@ -826,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;
@@ -854,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)
@@ -869,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";
@@ -914,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);
@@ -931,7 +972,8 @@ 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;
@@ -978,7 +1020,8 @@ out:
 /* 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;
@@ -1007,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);
 
@@ -1031,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);
@@ -1103,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 = {
@@ -1125,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);
@@ -1147,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 = {
@@ -1163,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 = {
@@ -1186,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;
@@ -1248,7 +1298,8 @@ out:
 	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;
@@ -1265,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;
@@ -1280,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;
@@ -1293,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;
 
@@ -1316,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.");
@@ -1346,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;
@@ -1391,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;
@@ -1441,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;
@@ -1518,7 +1575,8 @@ static int wimfs_access(const char *path, int mask)
 }
 #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();
@@ -1538,7 +1596,8 @@ static int wimfs_chmod(const char *path, mode_t mask)
 	return ret ? -ENOMEM : 0;
 }
 
-static int wimfs_chown(const char *path, uid_t uid, gid_t gid)
+static int
+wimfs_chown(const char *path, uid_t uid, gid_t gid)
 {
 	struct wim_dentry *dentry;
 	struct wimfs_context *ctx = wimfs_get_context();
@@ -1560,7 +1619,8 @@ static int wimfs_chown(const char *path, uid_t uid, gid_t gid)
 }
 
 /* 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) {
@@ -1587,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);
@@ -1609,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;
@@ -1626,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;
@@ -1670,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;
@@ -1678,6 +1742,7 @@ 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)
@@ -1696,9 +1761,10 @@ static int wimfs_link(const char *to, const char *from)
 	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;
@@ -1714,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;
@@ -1731,36 +1799,47 @@ 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 image. */
-static int wimfs_mkdir(const char *path, mode_t mode)
+static int
+wimfs_mkdir(const char *path, mode_t mode)
 {
 	return create_dentry(fuse_get_context(), path, mode | S_IFDIR,
 			     FILE_ATTRIBUTE_DIRECTORY, NULL);
 }
 
 /* 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)
+static int
+wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 {
 	const char *stream_name;
 	struct fuse_context *fuse_ctx = fuse_get_context();
@@ -1798,9 +1877,9 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 	}
 }
 
-
 /* 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;
@@ -1857,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;
@@ -1879,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;
@@ -1911,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;
@@ -1924,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;
@@ -1957,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);
@@ -1975,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);
@@ -1990,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;
@@ -2017,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;
@@ -2074,7 +2175,8 @@ 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 *dentry;
 	WIMStruct *w = wimfs_get_WIMStruct();
@@ -2095,8 +2197,9 @@ 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_inode *inode;
@@ -2124,7 +2227,7 @@ static int wimfs_setxattr(const char *path, const char *name,
 			return -ENOATTR;
 	}
 
-	ret = inode_add_ads_with_data(inode, name, (const u8*)value,
+	ret = inode_add_ads_with_data(inode, name, value,
 				      size, ctx->wim->lookup_table);
 	if (ret == 0) {
 		if (existing_ads_entry)
@@ -2136,7 +2239,8 @@ static int wimfs_setxattr(const char *path, const char *name,
 }
 #endif
 
-static int wimfs_symlink(const char *to, const char *from)
+static int
+wimfs_symlink(const char *to, const char *from)
 {
 	struct fuse_context *fuse_ctx = fuse_get_context();
 	struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
@@ -2159,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;
@@ -2198,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;
@@ -2226,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;
@@ -2241,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;
@@ -2267,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;
@@ -2296,9 +2404,8 @@ 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;
 }
 
@@ -2363,10 +2470,11 @@ 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;
 	char *argv[16];
@@ -2577,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;
@@ -2627,7 +2736,8 @@ 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!");
@@ -2638,18 +2748,20 @@ static inline int mount_unsupported_error()
 	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 */