wimlib_mount_image(): Correctly return NOMEM in one case
[wimlib] / src / mount_image.c
index 82b80b9..41478d9 100644 (file)
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/error.h"
 
 #ifdef WITH_FUSE
 
 #  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 "wimlib/encoding.h"
+#include "wimlib/file_io.h"
+#include "wimlib/dentry.h"
+#include "wimlib/inode.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/paths.h"
+#include "wimlib/reparse.h"
+#include "wimlib/resource.h"
+#include "wimlib/timestamp.h"
+#include "wimlib/version.h"
+#include "wimlib/write.h"
+#include "wimlib/xml.h"
 
 #include <errno.h>
 #include <ftw.h>
@@ -68,7 +81,7 @@
 struct wimfs_fd {
        struct wim_inode *f_inode;
        struct wim_lookup_table_entry *f_lte;
-       int staging_fd;
+       struct filedes staging_fd;
        u16 idx;
        u32 stream_id;
 };
@@ -104,9 +117,9 @@ struct wimfs_context {
        /* Name and message queue descriptors for message queues between the
         * filesystem daemon process and the unmount process.  These are used
         * when the filesystem is unmounted and the process running
-        * wimlib_unmount_image() (i.e. the `imagex unmount' command) needs to
-        * communicate with the filesystem daemon running fuse_main() (i.e. the
-        * daemon created by the `imagex mount' or `imagex mountrw' commands */
+        * wimlib_unmount_image() needs to communicate with the filesystem
+        * daemon running fuse_main() (i.e. the process created by a call to
+        * wimlib_mount_image().  */
        char *unmount_to_daemon_mq_name;
        char *daemon_to_unmount_mq_name;
        mqd_t unmount_to_daemon_mq;
@@ -130,23 +143,17 @@ 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()
+wimfs_get_context(void)
 {
        return WIMFS_CTX(fuse_get_context());
 }
 
 static inline WIMStruct *
-wimfs_get_WIMStruct()
+wimfs_get_WIMStruct(void)
 {
        return wimfs_get_context()->wim;
 }
 
-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)
 {
@@ -157,7 +164,8 @@ get_lookup_flags(const struct wimfs_context *ctx)
 static inline int
 flags_writable(int open_flags)
 {
-       return open_flags & (O_RDWR | O_WRONLY);
+       int accmode = (open_flags & O_ACCMODE);
+       return (accmode == O_RDWR || accmode == O_WRONLY);
 }
 
 /*
@@ -167,7 +175,6 @@ flags_writable(int open_flags)
  * @stream_id: ID of the stream we're opening
  * @lte:       Lookup table entry for the stream (may be NULL)
  * @fd_ret:    Return the allocated file descriptor if successful.
- * @readonly:  True if this is a read-only mount.
  *
  * Return 0 iff successful or error code if unsuccessful.
  */
@@ -175,15 +182,12 @@ 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)
+              struct wimfs_fd **fd_ret)
 {
        static const u16 fds_per_alloc = 8;
        static const u16 max_fds = 0xffff;
        int ret;
 
-       pthread_mutex_lock(&inode->i_mutex);
-
        DEBUG("Allocating fd for stream ID %u from inode %#"PRIx64" "
              "(open = %u, allocated = %u)",
              stream_id, inode->i_ino, inode->i_num_opened_fds,
@@ -219,15 +223,15 @@ alloc_wimfs_fd(struct wim_inode *inode,
                                ret = -ENOMEM;
                                break;
                        }
-                       fd->f_inode    = inode;
-                       fd->f_lte      = lte;
-                       fd->staging_fd = -1;
-                       fd->idx        = i;
-                       fd->stream_id  = stream_id;
-                       *fd_ret        = fd;
-                       inode->i_fds[i]  = fd;
+                       fd->f_inode     = inode;
+                       fd->f_lte       = lte;
+                       filedes_invalidate(&fd->staging_fd);
+                       fd->idx         = i;
+                       fd->stream_id   = stream_id;
+                       *fd_ret         = fd;
+                       inode->i_fds[i] = fd;
                        inode->i_num_opened_fds++;
-                       if (lte && !readonly)
+                       if (lte)
                                lte->num_opened_fds++;
                        DEBUG("Allocated fd (idx = %u)", fd->idx);
                        ret = 0;
@@ -235,7 +239,6 @@ alloc_wimfs_fd(struct wim_inode *inode,
                }
        }
 out:
-       pthread_mutex_unlock(&inode->i_mutex);
        return ret;
 }
 
@@ -243,9 +246,6 @@ static void
 inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
 {
        wimlib_assert(inode != NULL);
-
-       pthread_mutex_lock(&inode->i_mutex);
-
        wimlib_assert(fd->f_inode == inode);
        wimlib_assert(inode->i_num_opened_fds != 0);
        wimlib_assert(fd->idx < inode->i_num_allocated_fds);
@@ -253,11 +253,12 @@ inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
 
        inode->i_fds[fd->idx] = NULL;
        FREE(fd);
-       if (--inode->i_num_opened_fds == 0 && inode->i_nlink == 0) {
-               pthread_mutex_unlock(&inode->i_mutex);
-               free_inode(inode);
-       } else {
-               pthread_mutex_unlock(&inode->i_mutex);
+       if (--inode->i_num_opened_fds == 0) {
+               FREE(inode->i_fds);
+               inode->i_fds = NULL;
+               inode->i_num_allocated_fds = 0;
+               if (inode->i_nlink == 0)
+                       free_inode(inode);
        }
 }
 
@@ -272,9 +273,9 @@ lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
        /* Close staging file descriptor if needed. */
 
        if (lte->resource_location == RESOURCE_IN_STAGING_FILE
-            && fd->staging_fd != -1)
+            && filedes_valid(&fd->staging_fd))
        {
-               if (close(fd->staging_fd) != 0) {
+               if (filedes_close(&fd->staging_fd)) {
                        ERROR_WITH_ERRNO("Failed to close staging file");
                        return -errno;
                }
@@ -299,6 +300,15 @@ close_wimfs_fd(struct wimfs_fd *fd)
        return 0;
 }
 
+static mode_t
+fuse_mask_mode(mode_t mode, struct fuse_context *fuse_ctx)
+{
+#if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 8)
+       mode &= ~fuse_ctx->umask;
+#endif
+       return mode;
+}
+
 /*
  * Add a new dentry with a new inode to a WIM image.
  *
@@ -314,7 +324,7 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
        struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
        int ret;
 
-       parent = get_parent_dentry(wimfs_ctx->wim, path);
+       parent = get_parent_dentry(wimfs_ctx->wim, path, WIMLIB_CASE_SENSITIVE);
        if (!parent)
                return -errno;
 
@@ -322,7 +332,7 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
                return -ENOTDIR;
 
        basename = path_basename(path);
-       if (get_dentry_child_with_name(parent, basename))
+       if (get_dentry_child_with_name(parent, basename, WIMLIB_CASE_SENSITIVE))
                return -EEXIST;
 
        ret = new_dentry_with_inode(basename, &new);
@@ -337,7 +347,7 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
                if (inode_set_unix_data(new->d_inode,
                                        fuse_ctx->uid,
                                        fuse_ctx->gid,
-                                       mode & ~fuse_ctx->umask,
+                                       fuse_mask_mode(mode, fuse_ctx),
                                        wimfs_ctx->wim->lookup_table,
                                        UNIX_DATA_ALL | UNIX_DATA_CREATE))
                {
@@ -352,6 +362,17 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
        return 0;
 }
 
+static struct wim_inode *
+wim_pathname_to_inode(WIMStruct *wim, const tchar *path)
+{
+       struct wim_dentry *dentry;
+       dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
+       if (dentry)
+               return dentry->d_inode;
+       else
+               return NULL;
+}
+
 /* Remove a dentry from a mounted WIM image; i.e. remove an alias for the
  * corresponding inode.
  *
@@ -419,7 +440,7 @@ inode_to_stbuf(const struct wim_inode *inode,
        stbuf->st_ino = (ino_t)inode->i_ino;
        stbuf->st_nlink = inode->i_nlink;
        if (lte)
-               stbuf->st_size = wim_resource_size(lte);
+               stbuf->st_size = lte->size;
        else
                stbuf->st_size = 0;
 #ifdef HAVE_STAT_NANOSECOND_PRECISION
@@ -467,7 +488,7 @@ create_staging_file(char **name_ret, struct wimfs_context *ctx)
        static const size_t STAGING_FILE_NAME_LEN = 20;
 
        name_len = ctx->staging_dir_name_len + 1 + STAGING_FILE_NAME_LEN;
-       name = MALLOC(name_len + 1);
+       name = MALLOC(name_len + 1);
        if (!name) {
                errno = ENOMEM;
                return -1;
@@ -551,8 +572,10 @@ extract_resource_to_staging_dir(struct wim_inode *inode,
 
        /* Extract the stream to the staging file (possibly truncated) */
        if (old_lte) {
-               extract_size = min(wim_resource_size(old_lte), size);
-               ret = extract_wim_resource_to_fd(old_lte, fd, extract_size);
+               struct filedes wimlib_fd;
+               filedes_init(&wimlib_fd, fd);
+               extract_size = min(old_lte->size, size);
+               ret = extract_stream_to_fd(old_lte, &wimlib_fd, extract_size);
        } else {
                ret = 0;
                extract_size = 0;
@@ -621,15 +644,18 @@ extract_resource_to_staging_dir(struct wim_inode *inode,
                        struct wimfs_fd *fd = inode->i_fds[i];
                        if (fd) {
                                if (fd->stream_id == stream_id) {
+                                       int raw_fd;
+
                                        wimlib_assert(fd->f_lte == old_lte);
-                                       wimlib_assert(fd->staging_fd == -1);
+                                       wimlib_assert(!filedes_valid(&fd->staging_fd));
                                        fd->f_lte = new_lte;
                                        new_lte->num_opened_fds++;
-                                       fd->staging_fd = open(staging_file_name, O_RDONLY);
-                                       if (fd->staging_fd == -1) {
+                                       raw_fd = open(staging_file_name, O_RDONLY);
+                                       if (raw_fd < 0) {
                                                ret = -errno;
                                                goto out_revert_fd_changes;
                                        }
+                                       filedes_init(&fd->staging_fd, raw_fd);
                                }
                                j++;
                        }
@@ -642,26 +668,15 @@ extract_resource_to_staging_dir(struct wim_inode *inode,
                }
        }
 
-       new_lte->refcnt            = inode->i_nlink;
-       new_lte->resource_location = RESOURCE_IN_STAGING_FILE;
-       new_lte->staging_file_name = staging_file_name;
-       new_lte->lte_inode         = inode;
+       lte_put_resource(new_lte);
+       new_lte->refcnt              = inode->i_nlink;
+       new_lte->resource_location   = RESOURCE_IN_STAGING_FILE;
+       new_lte->staging_file_name   = staging_file_name;
+       new_lte->size                = size;
 
-       struct wim_lookup_table_entry **back_ptr;
-
-       if (stream_id == 0) {
-               back_ptr = &inode->i_lte;
-       } else {
-               for (u16 i = 0; ; i++) {
-                       wimlib_assert(i < inode->i_num_ads);
-                       if (inode->i_ads_entries[i].stream_id == stream_id) {
-                               back_ptr = &inode->i_ads_entries[i].lte;
-                               break;
-                       }
-               }
-       }
-
-       lookup_table_insert_unhashed(ctx->wim->lookup_table, new_lte, back_ptr);
+       add_unhashed_stream(new_lte, inode, stream_id,
+                           &wim_get_current_image_metadata(ctx->wim)->unhashed_streams);
+       *retrieve_lte_pointer(new_lte) = new_lte;
        *lte = new_lte;
        return 0;
 out_revert_fd_changes:
@@ -669,9 +684,9 @@ out_revert_fd_changes:
                struct wimfs_fd *fd = inode->i_fds[i];
                if (fd && fd->stream_id == stream_id && fd->f_lte == new_lte) {
                        fd->f_lte = old_lte;
-                       if (fd->staging_fd != -1) {
-                               close(fd->staging_fd);
-                               fd->staging_fd = -1;
+                       if (filedes_valid(&fd->staging_fd)) {
+                               filedes_close(&fd->staging_fd);
+                               filedes_invalidate(&fd->staging_fd);
                        }
                        j++;
                }
@@ -802,27 +817,31 @@ rebuild_wim(struct wimfs_context *ctx, int write_flags,
            wimlib_progress_func_t progress_func)
 {
        int ret;
-       struct wim_lookup_table_entry *lte;
-       WIMStruct *w = ctx->wim;
+       struct wim_lookup_table_entry *lte, *tmp;
+       WIMStruct *wim = ctx->wim;
        struct wim_image_metadata *imd = wim_get_current_image_metadata(ctx->wim);
 
        DEBUG("Closing all staging file descriptors.");
-       image_for_each_unhashed_stream(lte, imd) {
-               ret = inode_close_fds(lte->lte_inode);
+       image_for_each_unhashed_stream_safe(lte, tmp, imd) {
+               ret = inode_close_fds(lte->back_inode);
                if (ret)
                        return ret;
        }
 
        DEBUG("Freeing entries for zero-length streams");
-       image_for_each_unhashed_stream(lte, imd) {
-               if (wim_resource_size(lte) == 0) {
-                       *lte->back_ptr = NULL;
+       image_for_each_unhashed_stream_safe(lte, tmp, imd) {
+               wimlib_assert(lte->unhashed);
+               if (lte->size == 0) {
+                       struct wim_lookup_table_entry **back_ptr;
+                       back_ptr = retrieve_lte_pointer(lte);
+                       *back_ptr = NULL;
+                       list_del(&lte->unhashed_list);
                        free_lookup_table_entry(lte);
                }
        }
 
-       xml_update_image_info(w, w->current_image);
-       ret = wimlib_overwrite(w, write_flags, 0, progress_func);
+       xml_update_image_info(wim, wim->current_image);
+       ret = wimlib_overwrite(wim, write_flags, 0, progress_func);
        if (ret)
                ERROR("Failed to commit changes to mounted WIM image");
        return ret;
@@ -851,7 +870,7 @@ set_message_queue_names(struct wimfs_context *ctx, const char *mount_dir)
        char *p;
        int ret;
 
-       dir_path = realpath(mount_dir, NULL);
+       dir_path = realpath(mount_dir, NULL);
        if (!dir_path) {
                ERROR_WITH_ERRNO("Failed to resolve path \"%s\"", mount_dir);
                if (errno == ENOMEM)
@@ -1033,29 +1052,29 @@ struct unmount_msg_hdr {
        u32 cur_version;
        u32 msg_type;
        u32 msg_size;
-} PACKED;
+} _packed_attribute;
 
 struct msg_unmount_request {
        struct unmount_msg_hdr hdr;
        u32 unmount_flags;
        u8 want_progress_messages;
-} PACKED;
+} _packed_attribute;
 
 struct msg_daemon_info {
        struct unmount_msg_hdr hdr;
        pid_t daemon_pid;
        u32 mount_flags;
-} PACKED;
+} _packed_attribute;
 
 struct msg_unmount_finished {
        struct unmount_msg_hdr hdr;
-       int32_t status;
-} PACKED;
+       s32 status;
+} _packed_attribute;
 
 struct msg_write_streams_progress {
        struct unmount_msg_hdr hdr;
        union wimlib_progress_info info;
-} PACKED;
+} _packed_attribute;
 
 enum {
        MSG_TYPE_UNMOUNT_REQUEST,
@@ -1281,25 +1300,19 @@ msg_unmount_finished_handler(const void *_msg, void *_handler_ctx)
 static int
 unmount_timed_out_cb(void *_handler_ctx)
 {
-       struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
+       const struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
 
-       if (handler_ctx->daemon_pid == 0) {
-               goto out_crashed;
-       } else {
-               kill(handler_ctx->daemon_pid, 0);
-               if (errno == ESRCH) {
-                       goto out_crashed;
-               } else {
-                       DEBUG("Filesystem daemon is still alive... "
-                             "Waiting another %d seconds\n",
-                             handler_ctx->hdr.timeout_seconds);
-                       return 0;
-               }
+       if (handler_ctx->daemon_pid == 0 ||
+           (kill(handler_ctx->daemon_pid, 0) != 0 && errno == ESRCH))
+       {
+               ERROR("The filesystem daemon has crashed!  Changes to the "
+                     "WIM may not have been commited.");
+               return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
        }
-out_crashed:
-       ERROR("The filesystem daemon has crashed!  Changes to the "
-             "WIM may not have been commited.");
-       return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
+
+       DEBUG("Filesystem daemon is still alive... "
+             "Waiting another %d seconds", handler_ctx->hdr.timeout_seconds);
+       return 0;
 }
 
 static int
@@ -1431,7 +1444,7 @@ message_loop(mqd_t mq,
  *  daemon to finish writing the WIM file.
  */
 static int
-execute_fusermount(const char *dir)
+execute_fusermount(const char *dir, bool lazy)
 {
        pid_t pid;
        int ret;
@@ -1444,7 +1457,15 @@ execute_fusermount(const char *dir)
        }
        if (pid == 0) {
                /* Child */
-               execlp("fusermount", "fusermount", "-u", dir, NULL);
+               char *argv[10];
+               char **argp = argv;
+               *argp++ = "fusermount";
+               if (lazy)
+                       *argp++ = "-z";
+               *argp++ = "-u";
+               *argp++ = (char*)dir;
+               *argp = NULL;
+               execvp("fusermount", argv);
                ERROR_WITH_ERRNO("Failed to execute `fusermount'");
                exit(WIMLIB_ERR_FUSERMOUNT);
        }
@@ -1482,7 +1503,14 @@ execute_fusermount(const char *dir)
        }
        if (pid == 0) {
                /* Child */
-               execlp("umount", "umount", dir, NULL);
+               char *argv[10];
+               char **argp = argv;
+               *argp++ = "umount";
+               if (lazy)
+                       *argp++ = "-l";
+               *argp++ = (char*)dir;
+               *argp = NULL;
+               execvp("umount", argv);
                ERROR_WITH_ERRNO("Failed to execute `umount'");
                exit(WIMLIB_ERR_FUSERMOUNT);
        }
@@ -1494,19 +1522,14 @@ execute_fusermount(const char *dir)
                                 "terminate");
                return WIMLIB_ERR_FUSERMOUNT;
        }
-       if (status != 0) {
+
+       if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
                ERROR("`umount' did not successfully complete");
                return WIMLIB_ERR_FUSERMOUNT;
        }
-       return 0;
-}
 
-#if 0
-static int wimfs_access(const char *path, int mask)
-{
-       return -ENOSYS;
+       return 0;
 }
-#endif
 
 static int
 wimfs_chmod(const char *path, mode_t mask)
@@ -1518,8 +1541,8 @@ wimfs_chmod(const char *path, mode_t mask)
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
                return -EPERM;
 
-       ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
-                             &dentry, NULL, NULL);
+       ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
+                                    &dentry, NULL, NULL);
        if (ret)
                return ret;
 
@@ -1539,8 +1562,8 @@ wimfs_chown(const char *path, uid_t uid, gid_t gid)
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
                return -EPERM;
 
-       ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
-                             &dentry, NULL, NULL);
+       ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
+                                    &dentry, NULL, NULL);
        if (ret)
                return ret;
 
@@ -1569,17 +1592,6 @@ wimfs_destroy(void *p)
        }
 }
 
-#if 0
-static int wimfs_fallocate(const char *path, int mode,
-                          off_t offset, off_t len, struct fuse_file_info *fi)
-{
-       struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
-       wimlib_assert(fd->staging_fd != -1);
-       return fallocate(fd->staging_fd, mode, offset, len);
-}
-
-#endif
-
 static int
 wimfs_fgetattr(const char *path, struct stat *stbuf,
               struct fuse_file_info *fi)
@@ -1592,11 +1604,11 @@ 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);
+       int ret = ftruncate(fd->staging_fd.fd, size);
        if (ret)
                return -errno;
        touch_inode(fd->f_inode);
-       fd->f_lte->resource_entry.original_size = size;
+       fd->f_lte->size = size;
        return 0;
 }
 
@@ -1611,9 +1623,10 @@ wimfs_getattr(const char *path, struct stat *stbuf)
        int ret;
        struct wimfs_context *ctx = wimfs_get_context();
 
-       ret = lookup_resource(ctx->wim, path,
-                             get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK,
-                             &dentry, &lte, NULL);
+       ret = wim_pathname_to_stream(ctx->wim, path,
+                                    get_lookup_flags(ctx) |
+                                       LOOKUP_FLAG_DIRECTORY_OK,
+                                    &dentry, &lte, NULL);
        if (ret != 0)
                return ret;
        return inode_to_stbuf(dentry->d_inode, lte, stbuf);
@@ -1628,14 +1641,14 @@ wimfs_getxattr(const char *path, const char *name, char *value,
        int ret;
        struct wim_inode *inode;
        struct wim_ads_entry *ads_entry;
-       size_t res_size;
+       u64 stream_size;
        struct wim_lookup_table_entry *lte;
        struct wimfs_context *ctx = wimfs_get_context();
 
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 
-       if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+       if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0)
                return -ENOATTR;
        name += 5;
 
@@ -1648,19 +1661,22 @@ wimfs_getxattr(const char *path, const char *name, char *value,
                return -ENOATTR;
 
        lte = ads_entry->lte;
-       res_size = wim_resource_size(lte);
+       stream_size = lte->size;
 
        if (size == 0)
-               return res_size;
+               return stream_size;
 
-       if (res_size > size)
+       if (stream_size > size)
                return -ERANGE;
 
-       ret = read_full_resource_into_buf(lte, value, true);
-       if (ret != 0)
-               return -EIO;
-
-       return res_size;
+       ret = read_full_stream_into_buf(lte, value);
+       if (ret) {
+               if (errno)
+                       return -errno;
+               else
+                       return -EIO;
+       }
+       return stream_size;
 }
 #endif
 
@@ -1671,10 +1687,10 @@ wimfs_link(const char *to, const char *from)
        struct wim_dentry *from_dentry, *from_dentry_parent;
        const char *link_name;
        struct wim_inode *inode;
-       WIMStruct *w = wimfs_get_WIMStruct();
+       WIMStruct *wim = wimfs_get_WIMStruct();
        int ret;
 
-       inode = wim_pathname_to_inode(w, to);
+       inode = wim_pathname_to_inode(wim, to);
        if (!inode)
                return -errno;
 
@@ -1682,14 +1698,15 @@ wimfs_link(const char *to, const char *from)
                                   FILE_ATTRIBUTE_REPARSE_POINT))
                return -EPERM;
 
-       from_dentry_parent = get_parent_dentry(w, from);
+       from_dentry_parent = get_parent_dentry(wim, from, WIMLIB_CASE_SENSITIVE);
        if (!from_dentry_parent)
                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))
+       if (get_dentry_child_with_name(from_dentry_parent, link_name,
+                                      WIMLIB_CASE_SENSITIVE))
                return -EEXIST;
 
        ret = new_dentry(link_name, &from_dentry);
@@ -1726,6 +1743,10 @@ wimfs_listxattr(const char *path, char *list, size_t size)
 
        p = list;
        for (i = 0; i < inode->i_num_ads; i++) {
+
+               if (!ads_entry_is_named_stream(&inode->i_ads_entries[i]))
+                       continue;
+
                char *stream_name_mbs;
                size_t stream_name_mbs_nbytes;
                int ret;
@@ -1813,18 +1834,22 @@ wimfs_open(const char *path, struct fuse_file_info *fi)
        u16 stream_idx;
        u32 stream_id;
        struct wimfs_context *ctx = wimfs_get_context();
+       struct wim_lookup_table_entry **back_ptr;
 
-       ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
-                             &dentry, &lte, &stream_idx);
-       if (ret != 0)
+       ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
+                                    &dentry, &lte, &stream_idx);
+       if (ret)
                return ret;
 
        inode = dentry->d_inode;
 
-       if (stream_idx == 0)
+       if (stream_idx == 0) {
                stream_id = 0;
-       else
+               back_ptr = &inode->i_lte;
+       } else {
                stream_id = inode->i_ads_entries[stream_idx - 1].stream_id;
+               back_ptr = &inode->i_ads_entries[stream_idx - 1].lte;
+       }
 
        /* The file resource may be in the staging directory (read-write mounts
         * only) or in the WIM.  If it's in the staging directory, we need to
@@ -1835,25 +1860,28 @@ wimfs_open(const char *path, struct fuse_file_info *fi)
 
        if (flags_writable(fi->flags) &&
             (!lte || lte->resource_location != RESOURCE_IN_STAGING_FILE)) {
-               u64 size = (lte) ? wim_resource_size(lte) : 0;
+               u64 size = (lte) ? lte->size : 0;
                ret = extract_resource_to_staging_dir(inode, stream_id,
                                                      &lte, size, ctx);
-               if (ret != 0)
+               if (ret)
                        return ret;
+               *back_ptr = lte;
        }
 
-       ret = alloc_wimfs_fd(inode, stream_id, lte, &fd,
-                            wimfs_ctx_readonly(ctx));
-       if (ret != 0)
+       ret = alloc_wimfs_fd(inode, stream_id, lte, &fd);
+       if (ret)
                return ret;
 
        if (lte && lte->resource_location == RESOURCE_IN_STAGING_FILE) {
-               fd->staging_fd = open(lte->staging_file_name, fi->flags);
-               if (fd->staging_fd == -1) {
+               int raw_fd;
+
+               raw_fd = open(lte->staging_file_name, fi->flags);
+               if (raw_fd < 0) {
                        int errno_save = errno;
                        close_wimfs_fd(fd);
                        return -errno_save;
                }
+               filedes_init(&fd->staging_fd, raw_fd);
        }
        fi->fh = (uintptr_t)fd;
        return 0;
@@ -1867,14 +1895,14 @@ wimfs_opendir(const char *path, struct fuse_file_info *fi)
        int ret;
        struct wimfs_fd *fd = NULL;
        struct wimfs_context *ctx = wimfs_get_context();
-       WIMStruct *w = ctx->wim;
+       WIMStruct *wim = ctx->wim;
 
-       inode = wim_pathname_to_inode(w, path);
+       inode = wim_pathname_to_inode(wim, path);
        if (!inode)
                return -errno;
        if (!inode_is_directory(inode))
                return -ENOTDIR;
-       ret = alloc_wimfs_fd(inode, 0, NULL, &fd, wimfs_ctx_readonly(ctx));
+       ret = alloc_wimfs_fd(inode, 0, NULL, &fd);
        fi->fh = (uintptr_t)fd;
        return ret;
 }
@@ -1889,31 +1917,38 @@ wimfs_read(const char *path, char *buf, size_t size,
 {
        struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
        ssize_t ret;
-       u64 res_size;
+       u64 stream_size;
 
        if (!fd)
                return -EBADF;
 
-       if (!fd->f_lte) /* Empty stream with no lookup table entry */
+       if (size == 0)
                return 0;
 
-       res_size = wim_resource_size(fd->f_lte);
-       if (offset > res_size)
+       if (fd->f_lte)
+               stream_size = fd->f_lte->size;
+       else
+               stream_size = 0;
+
+       if (offset > stream_size)
                return -EOVERFLOW;
-       size = min(size, INT_MAX);
-       size = min(size, res_size - offset);
+
+       size = min(size, stream_size - offset);
+       if (size == 0)
+               return 0;
 
        switch (fd->f_lte->resource_location) {
        case RESOURCE_IN_STAGING_FILE:
-               ret = pread(fd->staging_fd, buf, size, offset);
-               if (ret < 0)
+               ret = raw_pread(&fd->staging_fd, buf, size, offset);
+               if (ret == -1)
                        ret = -errno;
                break;
        case RESOURCE_IN_WIM:
-               if (read_partial_wim_resource_into_buf(fd->f_lte, size,
-                                                      offset, buf, true))
-                       ret = -errno;
-               ret = size;
+               if (read_partial_wim_stream_into_buf(fd->f_lte, size,
+                                                    offset, buf))
+                       ret = errno ? -errno : -EIO;
+               else
+                       ret = size;
                break;
        case RESOURCE_IN_ATTACHED_BUFFER:
                memcpy(buf, fd->f_lte->attached_buffer + offset, size);
@@ -1990,10 +2025,16 @@ wimfs_readlink(const char *path, char *buf, size_t buf_len)
                return -errno;
        if (!inode_is_symlink(inode))
                return -EINVAL;
-
-       ret = inode_readlink(inode, buf, buf_len, ctx->wim, true);
-       if (ret > 0)
+       if (buf_len == 0)
+               return -EINVAL;
+       ret = wim_inode_readlink(inode, buf, buf_len - 1, NULL);
+       if (ret >= 0) {
+               wimlib_assert(ret <= buf_len - 1);
+               buf[ret] = '\0';
                ret = 0;
+       } else if (ret == -ENAMETOOLONG) {
+               buf[buf_len - 1] = '\0';
+       }
        return ret;
 }
 
@@ -2046,58 +2087,8 @@ wimfs_removexattr(const char *path, const char *name)
 static int
 wimfs_rename(const char *from, const char *to)
 {
-       struct wim_dentry *src;
-       struct wim_dentry *dst;
-       struct wim_dentry *parent_of_dst;
-       WIMStruct *w = wimfs_get_WIMStruct();
-       int ret;
-
-       /* This rename() implementation currently only supports actual files
-        * (not alternate data streams) */
-
-       src = get_dentry(w, from);
-       if (!src)
-               return -errno;
-
-       dst = get_dentry(w, to);
-
-       if (dst) {
-               /* Destination file exists */
-
-               if (src == dst) /* Same file */
-                       return 0;
-
-               if (!dentry_is_directory(src)) {
-                       /* Cannot rename non-directory to directory. */
-                       if (dentry_is_directory(dst))
-                               return -EISDIR;
-               } else {
-                       /* Cannot rename directory to a non-directory or a non-empty
-                        * directory */
-                       if (!dentry_is_directory(dst))
-                               return -ENOTDIR;
-                       if (inode_has_children(dst->d_inode))
-                               return -ENOTEMPTY;
-               }
-               parent_of_dst = dst->parent;
-       } else {
-               /* Destination does not exist */
-               parent_of_dst = get_parent_dentry(w, to);
-               if (!parent_of_dst)
-                       return -errno;
-
-               if (!dentry_is_directory(parent_of_dst))
-                       return -ENOTDIR;
-       }
-
-       ret = set_dentry_name(src, path_basename(to));
-       if (ret != 0)
-               return -ENOMEM;
-       if (dst)
-               remove_dentry(dst, w->lookup_table);
-       unlink_dentry(src);
-       dentry_add_child(parent_of_dst, src);
-       return 0;
+       return rename_wim_path(wimfs_get_WIMStruct(), from, to,
+                              WIMLIB_CASE_SENSITIVE);
 }
 
 /* Remove a directory */
@@ -2105,9 +2096,9 @@ static int
 wimfs_rmdir(const char *path)
 {
        struct wim_dentry *dentry;
-       WIMStruct *w = wimfs_get_WIMStruct();
+       WIMStruct *wim = wimfs_get_WIMStruct();
 
-       dentry = get_dentry(w, path);
+       dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
        if (!dentry)
                return -errno;
 
@@ -2117,7 +2108,7 @@ wimfs_rmdir(const char *path)
        if (dentry_has_children(dentry))
                return -ENOTEMPTY;
 
-       remove_dentry(dentry, w->lookup_table);
+       remove_dentry(dentry, wim->lookup_table);
        return 0;
 }
 
@@ -2136,7 +2127,7 @@ wimfs_setxattr(const char *path, const char *name,
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 
-       if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+       if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0)
                return -ENOATTR;
        name += 5;
 
@@ -2177,11 +2168,14 @@ wimfs_symlink(const char *to, const char *from)
                            FILE_ATTRIBUTE_REPARSE_POINT, &dentry);
        if (ret == 0) {
                dentry->d_inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
-               if (inode_set_symlink(dentry->d_inode, to,
-                                     wimfs_ctx->wim->lookup_table, NULL))
-               {
+               ret = wim_inode_set_symlink(dentry->d_inode, to,
+                                           wimfs_ctx->wim->lookup_table);
+               if (ret) {
                        remove_dentry(dentry, wimfs_ctx->wim->lookup_table);
-                       ret = -ENOMEM;
+                       if (ret == WIMLIB_ERR_NOMEM)
+                               ret = -ENOMEM;
+                       else
+                               ret = -EIO;
                }
        }
        return ret;
@@ -2200,8 +2194,8 @@ wimfs_truncate(const char *path, off_t size)
        struct wim_inode *inode;
        struct wimfs_context *ctx = wimfs_get_context();
 
-       ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
-                             &dentry, &lte, &stream_idx);
+       ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
+                                    &dentry, &lte, &stream_idx);
 
        if (ret != 0)
                return ret;
@@ -2209,24 +2203,29 @@ wimfs_truncate(const char *path, off_t size)
        if (lte == NULL && size == 0)
                return 0;
 
-       inode = dentry->d_inode;
-       if (stream_idx == 0)
-               stream_id = 0;
-       else
-               stream_id = inode->i_ads_entries[stream_idx - 1].stream_id;
-
-       if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+       if (lte != NULL && lte->resource_location == RESOURCE_IN_STAGING_FILE) {
                ret = truncate(lte->staging_file_name, size);
-               if (ret != 0)
+               if (ret)
                        ret = -errno;
+               else
+                       lte->size = size;
        } else {
                /* File in WIM.  Extract it to the staging directory, but only
                 * the first @size bytes of it. */
+               struct wim_lookup_table_entry **back_ptr;
+
+               inode = dentry->d_inode;
+               if (stream_idx == 0) {
+                       stream_id = 0;
+                       back_ptr = &inode->i_lte;
+               } else {
+                       stream_id = inode->i_ads_entries[stream_idx - 1].stream_id;
+                       back_ptr = &inode->i_ads_entries[stream_idx - 1].lte;
+               }
                ret = extract_resource_to_staging_dir(inode, stream_id,
                                                      &lte, size, ctx);
+               *back_ptr = lte;
        }
-       if (ret == 0)
-               lte->resource_entry.original_size = size;
        return ret;
 }
 
@@ -2240,13 +2239,13 @@ wimfs_unlink(const char *path)
        u16 stream_idx;
        struct wimfs_context *ctx = wimfs_get_context();
 
-       ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
-                             &dentry, &lte, &stream_idx);
+       ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
+                                    &dentry, &lte, &stream_idx);
 
        if (ret != 0)
                return ret;
 
-       if (stream_idx == 0)
+       if (inode_stream_name_nbytes(dentry->d_inode, stream_idx) == 0)
                remove_dentry(dentry, ctx->wim->lookup_table);
        else
                inode_remove_ads(dentry->d_inode, stream_idx - 1,
@@ -2265,9 +2264,9 @@ wimfs_utimens(const char *path, const struct timespec tv[2])
 {
        struct wim_dentry *dentry;
        struct wim_inode *inode;
-       WIMStruct *w = wimfs_get_WIMStruct();
+       WIMStruct *wim = wimfs_get_WIMStruct();
 
-       dentry = get_dentry(w, path);
+       dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
        if (!dentry)
                return -errno;
        inode = dentry->d_inode;
@@ -2292,9 +2291,9 @@ wimfs_utime(const char *path, struct utimbuf *times)
 {
        struct wim_dentry *dentry;
        struct wim_inode *inode;
-       WIMStruct *w = wimfs_get_WIMStruct();
+       WIMStruct *wim = wimfs_get_WIMStruct();
 
-       dentry = get_dentry(w, path);
+       dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
        if (!dentry)
                return -errno;
        inode = dentry->d_inode;
@@ -2320,17 +2319,20 @@ wimfs_write(const char *path, const char *buf, size_t size,
 
        wimlib_assert(fd->f_lte != NULL);
        wimlib_assert(fd->f_lte->staging_file_name != NULL);
-       wimlib_assert(fd->staging_fd != -1);
+       wimlib_assert(filedes_valid(&fd->staging_fd));
        wimlib_assert(fd->f_inode != NULL);
 
        /* Write the data. */
-       ret = pwrite(fd->staging_fd, buf, size, offset);
+       ret = raw_pwrite(&fd->staging_fd, buf, size, offset);
        if (ret == -1)
                return -errno;
 
        /* Update file size */
-       if (offset + size > fd->f_lte->resource_entry.original_size)
-               fd->f_lte->resource_entry.original_size = offset + size;
+       if (offset + size > fd->f_lte->size) {
+               DEBUG("Update file size %"PRIu64 " => %"PRIu64"",
+                     fd->f_lte->size, offset + size);
+               fd->f_lte->size = offset + size;
+       }
 
        /* Update timestamps */
        touch_inode(fd->f_inode);
@@ -2338,15 +2340,9 @@ wimfs_write(const char *path, const char *buf, size_t size,
 }
 
 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,
-#endif
        .fgetattr    = wimfs_fgetattr,
        .ftruncate   = wimfs_ftruncate,
        .getattr     = wimfs_getattr,
@@ -2397,18 +2393,15 @@ static struct fuse_operations wimfs_operations = {
 };
 
 
-/* Mounts an image from a WIM file. */
+/* API function documented in wimlib.h  */
 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 mount_flags, const char *staging_dir)
 {
        int argc;
        char *argv[16];
        int ret;
        char *dir_copy;
-       struct wim_lookup_table *joined_tab, *wim_tab_save;
        struct wim_image_metadata *imd;
        struct wimfs_context ctx;
        struct wim_inode *inode;
@@ -2419,57 +2412,42 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
        if (!wim || !dir)
                return WIMLIB_ERR_INVALID_PARAM;
 
-       ret = verify_swm_set(wim, additional_swms, num_additional_swms);
-       if (ret)
-               return ret;
-
-       if ((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) && (wim->hdr.total_parts != 1)) {
-               ERROR("Cannot mount a split WIM read-write");
-               return WIMLIB_ERR_SPLIT_UNSUPPORTED;
-       }
-
-       if (num_additional_swms) {
-               ret = new_joined_lookup_table(wim, additional_swms,
-                                             num_additional_swms,
-                                             &joined_tab);
-               if (ret)
-                       return ret;
-               wim_tab_save = wim->lookup_table;
-               wim->lookup_table = joined_tab;
-       }
+       if (mount_flags & ~(WIMLIB_MOUNT_FLAG_READWRITE |
+                           WIMLIB_MOUNT_FLAG_DEBUG |
+                           WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE |
+                           WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR |
+                           WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS |
+                           WIMLIB_MOUNT_FLAG_UNIX_DATA |
+                           WIMLIB_MOUNT_FLAG_ALLOW_OTHER))
+               return WIMLIB_ERR_INVALID_PARAM;
 
        if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
-               ret = wim_run_full_verifications(wim);
+               ret = can_delete_from_wim(wim);
                if (ret)
-                       goto out;
+                       return ret;
        }
 
        ret = select_wim_image(wim, image);
        if (ret)
-               goto out;
+               return ret;
 
        DEBUG("Selected image %d", image);
 
        imd = wim_get_current_image_metadata(wim);
 
-       if (imd->refcnt != 1) {
-               ERROR("Cannot mount image that was just exported with "
-                     "wimlib_export_image()");
-               ret = WIMLIB_ERR_INVALID_PARAM;
-               goto out;
-       }
-
        if (imd->modified) {
-               ERROR("Cannot mount image that was added "
-                     "with wimlib_add_image()");
-               ret = WIMLIB_ERR_INVALID_PARAM;
-               goto out;
+               /* wimfs_read() only supports a limited number of stream
+                * locations, not including RESOURCE_IN_FILE_ON_DISK,
+                * RESOURCE_IN_NTFS_VOLUME, etc. that might appear if files were
+                * added to the WIM image.  */
+               ERROR("Cannot mount an image with newly added files!");
+               return WIMLIB_ERR_INVALID_PARAM;
        }
 
        if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
-               ret = lock_wim(wim, wim->fp);
+               ret = lock_wim(wim, wim->in_fd.fd);
                if (ret)
-                       goto out;
+                       return ret;
        }
 
        /* Use default stream interface if one was not specified */
@@ -2478,7 +2456,6 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
                       WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)))
                mount_flags |= WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR;
 
-
        DEBUG("Initializing struct wimfs_context");
        init_wimfs_context(&ctx);
        ctx.wim = wim;
@@ -2486,7 +2463,7 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
        ctx.image_inode_list = &imd->inode_list;
        ctx.default_uid = getuid();
        ctx.default_gid = getgid();
-       ctx.wim->lookup_table->unhashed_streams = &imd->unhashed_streams;
+       wimlib_assert(list_empty(&imd->unhashed_streams));
        if (mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
                ctx.default_lookup_flags = LOOKUP_FLAG_ADS_OK;
 
@@ -2499,16 +2476,17 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
        DEBUG("Preparing arguments to fuse_main()");
 
        dir_copy = STRDUP(dir);
-       if (!dir_copy)
+       if (!dir_copy) {
+               ret = WIMLIB_ERR_NOMEM;
                goto out_free_message_queue_names;
+       }
 
        argc = 0;
-       argv[argc++] = "imagex";
+       argv[argc++] = "wimlib";
        argv[argc++] = dir_copy;
 
-       /* disable multi-threaded operation for read-write mounts */
-       if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
-               argv[argc++] = "-s";
+       /* disable multi-threaded operation */
+       argv[argc++] = "-s";
 
        if (mount_flags & WIMLIB_MOUNT_FLAG_DEBUG)
                argv[argc++] = "-d";
@@ -2554,19 +2532,15 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 #endif
 
        /* Mark dentry tree as modified if read-write mount. */
-       if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
+       if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
                imd->modified = 1;
-               imd->has_been_mounted_rw = 1;
-       }
 
        /* Resolve the lookup table entries for every inode in the image, and
         * assign inode numbers */
        DEBUG("Resolving lookup table entries and assigning inode numbers");
        ctx.next_ino = 1;
-       image_for_each_inode(inode, imd) {
-               inode_resolve_ltes(inode, wim->lookup_table);
+       image_for_each_inode(inode, imd)
                inode->i_ino = ctx.next_ino++;
-       }
        DEBUG("(next_ino = %"PRIu64")", ctx.next_ino);
 
        DEBUG("Calling fuse_main()");
@@ -2598,18 +2572,10 @@ out_unlock:
        wim->wim_locked = 0;
 out_free_message_queue_names:
        free_message_queue_names(&ctx);
-out:
-       if (num_additional_swms) {
-               free_lookup_table(wim->lookup_table);
-               wim->lookup_table = wim_tab_save;
-       }
        return ret;
 }
 
-/*
- * Unmounts the WIM file that was previously mounted on @dir by using
- * wimlib_mount_image().
- */
+/* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_unmount_image(const char *dir, int unmount_flags,
                     wimlib_progress_func_t progress_func)
@@ -2617,6 +2583,13 @@ wimlib_unmount_image(const char *dir, int unmount_flags,
        int ret;
        struct wimfs_context wimfs_ctx;
 
+       if (unmount_flags & ~(WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY |
+                             WIMLIB_UNMOUNT_FLAG_COMMIT |
+                             WIMLIB_UNMOUNT_FLAG_REBUILD |
+                             WIMLIB_UNMOUNT_FLAG_RECOMPRESS |
+                             WIMLIB_UNMOUNT_FLAG_LAZY))
+               return WIMLIB_ERR_INVALID_PARAM;
+
        init_wimfs_context(&wimfs_ctx);
 
        ret = set_message_queue_names(&wimfs_ctx, dir);
@@ -2633,7 +2606,7 @@ wimlib_unmount_image(const char *dir, int unmount_flags,
        if (ret != 0)
                goto out_close_message_queues;
 
-       ret = execute_fusermount(dir);
+       ret = execute_fusermount(dir, (unmount_flags & WIMLIB_UNMOUNT_FLAG_LAZY) != 0);
        if (ret != 0)
                goto out_close_message_queues;
 
@@ -2662,7 +2635,7 @@ out:
 
 
 static int
-mount_unsupported_error()
+mount_unsupported_error(void)
 {
 #if defined(__WIN32__)
        ERROR("Sorry-- Mounting WIM images is not supported on Windows!");
@@ -2682,9 +2655,7 @@ wimlib_unmount_image(const tchar *dir, int unmount_flags,
 
 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)
+                  int mount_flags, const tchar *staging_dir)
 {
        return mount_unsupported_error();
 }