implement WIMLIB_INIT_FLAG_ASSUME_UTF8

[wimlib] / src / mount_image.c

diff --git a/src/mount_image.c b/src/mount_image.c
index d0b5d2c8c3977361da2c023cfb17fc5eb4b76540..a83c6ba239552ca7f6ada629236073c65668d247 100644 (file)
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -645,7 +645,6 @@ 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;
        new_lte->resource_entry.original_size = size;
 
        lookup_table_insert_unhashed(ctx->wim->lookup_table, new_lte,
@@ -796,7 +795,7 @@ rebuild_wim(struct wimfs_context *ctx, int write_flags,
 
        DEBUG("Closing all staging file descriptors.");
        image_for_each_unhashed_stream_safe(lte, tmp, imd) {
-               ret = inode_close_fds(lte->lte_inode);
+               ret = inode_close_fds(lte->back_inode);
                if (ret)
                        return ret;
        }
@@ -2484,7 +2483,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;
@@ -2561,10 +2559,8 @@ 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 */