Don't create unnecessary temporary files

[wimlib] / include / wimlib / apply.h

diff --git a/include/wimlib/apply.h b/include/wimlib/apply.h
index f8023a3706af18379754d36b5510b8eb4d1ee499..3b124d31c4936fb1e55e35247d9e1ef757bac498 100644 (file)
--- a/include/wimlib/apply.h
+++ b/include/wimlib/apply.h
@@ -1,6 +1,7 @@
 #ifndef _WIMLIB_APPLY_H
 #define _WIMLIB_APPLY_H
 
+#include "wimlib/file_io.h"
 #include "wimlib/types.h"
 #include "wimlib/list.h"
 #include "wimlib.h"
@@ -71,7 +72,7 @@ struct apply_operations {
        /* REQUIRED:  Extract unnamed data stream.  */
        int (*extract_unnamed_stream)
                (file_spec_t file, struct wim_lookup_table_entry *lte,
-                struct apply_ctx *ctx);
+                struct apply_ctx *ctx, struct wim_dentry *dentry);
 
        /* OPTIONAL:  Extracted named data stream.  In start_extract(), set
         * ctx->supported_features.alternate_data_streams if supported.  */
@@ -210,20 +211,24 @@ struct apply_ctx {
        size_t target_nchars;
        wimlib_progress_func_t progress_func;
        union wimlib_progress_info progress;
-       struct wim_dentry *extract_root;
        const struct apply_operations *ops;
+       struct list_head stream_list;
        struct wim_features supported_features;
+       bool root_dentry_is_special;
        u32 supported_attributes_mask;
-       struct list_head stream_list;
+
+       struct wim_dentry *target_dentry;
        tchar *realtarget;
        size_t realtarget_nchars;
        unsigned long invalid_sequence;
        unsigned long partial_security_descriptors;
        unsigned long no_security_descriptors;
+       struct wim_lookup_table_entry *cur_stream;
+       struct filedes tmpfile_fd;
+       tchar *tmpfile_name;
        u64 num_streams_remaining;
-       bool root_dentry_is_special;
        uint64_t next_progress;
-       intptr_t private[8];
+       intptr_t private[10];
 };
 
 #ifdef __WIN32__