encoding.c: Upgrade upcase table and rewrite decompression code

[wimlib] / src / mount_image.c

diff --git a/src/mount_image.c b/src/mount_image.c
index cc1bb5f9efe6d68935dadfe8f79b4e566d2f2147..8037a38f0da5b6a89dc24f2fb08fe78bde78e26a 100644 (file)
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -39,6 +39,8 @@
 
 #define FUSE_USE_VERSION 26
 
+#include <sys/types.h> /* sometimes required before <attr/xattr.h> */
+
 #include <attr/xattr.h>
 #include <dirent.h>
 #include <errno.h>
@@ -50,7 +52,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <utime.h>
 
@@ -939,17 +940,20 @@ delete_staging_dir(struct wimfs_context *ctx)
        close(ctx->parent_dir_fd);
 }
 
-/* Number the inodes in the mounted image sequentially.  */
 static void
-reassign_inode_numbers(struct wimfs_context *ctx)
+prepare_inodes(struct wimfs_context *ctx)
 {
        struct wim_image_metadata *imd;
        struct wim_inode *inode;
 
        ctx->next_ino = 1;
        imd = wim_get_current_image_metadata(ctx->wim);
-       image_for_each_inode(inode, imd)
+       image_for_each_inode(inode, imd) {
                inode->i_ino = ctx->next_ino++;
+               inode->i_num_opened_fds = 0;
+               inode->i_num_allocated_fds = 0;
+               inode->i_fds = NULL;
+       }
 }
 
 static void
@@ -2205,8 +2209,9 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
                }
        }
 
-       /* Assign new inode numbers.  */
-       reassign_inode_numbers(&ctx);
+       /* Number the inodes in the mounted image sequentially and initialize
+        * the file descriptor arrays  */
+       prepare_inodes(&ctx);
 
        /* If a read-write mount, mark the image as modified.  */
        if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)