win32_apply.c: open by inode number

diff --git a/configure.ac b/configure.ac
index 8c804b869cbdcab4b1d7e8adfafa0ccdfa8b7037..7d940bd013b821aedf5a004468e2511b6f6cd52d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 ###############################################################################
 
-AC_INIT([wimlib], [1.8.1-BETA], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.8.1-BETA1], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index 38f74a9f5a296fc40193e26fc87ba79f1a6535cd..7df09c83e7ea7db2ea05be2d4edb314af002dbf4 100644 (file)
--- a/include/wimlib/inode.h
+++ b/include/wimlib/inode.h
@@ -210,7 +210,7 @@ struct wim_inode {
                         * hard links or not.  */
                        struct list_head i_extraction_aliases;
 
-               #ifdef WITH_NTFS_3G
+               #if defined(WITH_NTFS_3G) || defined(__WIN32__)
                        /* In NTFS-3g extraction mode, this is set to the Master
                         * File Table (MFT) number of the NTFS file that was
                         * created for this inode.  */

diff --git a/src/win32_apply.c b/src/win32_apply.c
index b326e182a5eb788f8827c31ec0ca5f8675052299..66814655c6f746000fb437d32b8de8b338f3af15 100644 (file)
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -137,6 +137,8 @@ struct win32_apply_ctx {
        /* Have we tried to enable short name support on the target volume yet?
         */
        bool tried_to_enable_short_names;
+
+       bool can_open_by_inode_number;
 };
 
 /* Get the drive letter from a Windows path, or return the null character if the
@@ -846,6 +848,8 @@ prepare_target(struct list_head *dentry_list, struct win32_apply_ctx *ctx)
        if (!ctx->print_buffer)
                return WIMLIB_ERR_NOMEM;
 
+       ctx->can_open_by_inode_number = true;
+
        return 0;
 }
 
@@ -1168,6 +1172,41 @@ do_create_file(PHANDLE FileHandle,
                                    0);
 }
 
+static NTSTATUS
+do_create_file_by_inode(const struct wim_inode *inode,
+                       PHANDLE FileHandle,
+                       ACCESS_MASK DesiredAccess,
+                       PLARGE_INTEGER AllocationSize,
+                       ULONG FileAttributes,
+                       ULONG CreateDisposition,
+                       ULONG CreateOptions,
+                       struct win32_apply_ctx *ctx)
+{
+       UNICODE_STRING str;
+       NTSTATUS status;
+
+       if (ctx->can_open_by_inode_number) {
+               str.Buffer = (wchar_t *)&inode->i_mft_no;
+               str.Length = sizeof(inode->i_mft_no);
+               str.MaximumLength = str.Length;
+               CreateOptions |= FILE_OPEN_BY_FILE_ID;
+               ctx->attr.ObjectName = &str;
+       }
+
+       status = do_create_file(FileHandle,
+                               DesiredAccess,
+                               AllocationSize,
+                               FileAttributes,
+                               CreateDisposition,
+                               CreateOptions,
+                               ctx);
+
+       if (ctx->can_open_by_inode_number)
+               ctx->attr.ObjectName = &ctx->pathbuf;
+
+       return status;
+}
+
 /* Like do_create_file(), but builds the extraction path of the @dentry first.
  */
 static NTSTATUS
@@ -1340,6 +1379,24 @@ create_empty_named_data_streams(const struct wim_dentry *dentry,
        return ret;
 }
 
+static void
+save_inode_number(struct wim_inode *inode, HANDLE h, struct win32_apply_ctx *ctx)
+{
+       if (!ctx->can_open_by_inode_number)
+               return;
+
+       NTSTATUS status;
+       FILE_INTERNAL_INFORMATION info;
+
+       status = (*func_NtQueryInformationFile)(h, &ctx->iosb,
+                                               &info, sizeof(info),
+                                               FileInternalInformation);
+       if (NT_SUCCESS(status))
+               inode->i_mft_no = info.IndexNumber.QuadPart;
+       else
+               inode->i_mft_no = 0;
+}
+
 /*
  * Creates the directory named by @dentry, or uses an existing directory at that
  * location.  If necessary, sets the short name and/or fixes compression and
@@ -1392,6 +1449,10 @@ create_directory(const struct wim_dentry *dentry, struct win32_apply_ctx *ctx)
        }
 
        ret = adjust_compression_attribute(h, dentry, ctx);
+       if (ret)
+               goto out;
+
+       save_inode_number(dentry->d_inode, h, ctx);
 out:
        (*func_NtClose)(h);
        return ret;
@@ -1464,6 +1525,8 @@ create_nondirectory_inode(HANDLE *h_ret, const struct wim_dentry *dentry,
        if (ret)
                goto out_close;
 
+       save_inode_number(dentry->d_inode, h, ctx);
+
        *h_ret = h;
        return 0;
 
@@ -1699,14 +1762,14 @@ begin_extract_blob_instance(const struct blob_descriptor *blob,
                build_extraction_path(dentry, ctx);
        }
 
-
        /* Open a new handle  */
-       status = do_create_file(&h,
-                               FILE_WRITE_DATA | SYNCHRONIZE,
-                               NULL, 0, FILE_OPEN_IF,
-                               FILE_SEQUENTIAL_ONLY |
-                                       FILE_SYNCHRONOUS_IO_NONALERT,
-                               ctx);
+       status = do_create_file_by_inode(dentry->d_inode,
+                                        &h,
+                                        FILE_WRITE_DATA | SYNCHRONIZE,
+                                        NULL, 0, FILE_OPEN_IF,
+                                        FILE_SEQUENTIAL_ONLY |
+                                               FILE_SYNCHRONOUS_IO_NONALERT,
+                                        ctx);
        if (!NT_SUCCESS(status)) {
                winnt_error(status, L"Can't open \"%ls\" for writing",
                            current_path(ctx));
@@ -2368,8 +2431,10 @@ apply_metadata_to_file(const struct wim_dentry *dentry,
        build_extraction_path(dentry, ctx);
 
        /* Open a handle with as many relevant permissions as possible.  */
-       while (!NT_SUCCESS(status = do_create_file(&h, perms, NULL,
-                                                  0, FILE_OPEN, 0, ctx)))
+       while (!NT_SUCCESS(status =
+                          do_create_file_by_inode(dentry->d_inode, &h,
+                                                  perms, NULL, 0,
+                                                  FILE_OPEN, 0, ctx)))
        {
                if (status == STATUS_PRIVILEGE_NOT_HELD ||
                    status == STATUS_ACCESS_DENIED)