NTFS capture updates

[wimlib] / src / lookup_table.h

diff --git a/src/lookup_table.h b/src/lookup_table.h
index 6facf65adf7052ee6c282d7c719fcdc25d6189e6..c211fe142c45291de89973e4d658f5466c305b6f 100644 (file)
--- a/src/lookup_table.h
+++ b/src/lookup_table.h
@@ -10,7 +10,9 @@
 
 #define LOOKUP_FLAG_ADS_OK             0x00000001
 #define LOOKUP_FLAG_DIRECTORY_OK       0x00000002
-#define LOOKUP_FLAG_FOLLOW_SYMLINKS    0x00000004
+
+/* Not yet used */
+//#define LOOKUP_FLAG_FOLLOW_SYMLINKS  0x00000004
 
 
 /* A lookup table that is used to translate the hash codes of dentries into the
@@ -24,6 +26,18 @@ struct lookup_table {
 
 struct wimlib_fd;
 
+#ifdef WITH_NTFS_3G
+typedef struct _ntfs_attr ntfs_attr;
+typedef struct _ntfs_volume ntfs_volume;
+struct ntfs_location {
+       char *path_utf8;
+       char *stream_name_utf16;
+       u16 stream_name_utf16_num_chars;
+       ntfs_volume **ntfs_vol_p;
+       bool is_reparse_point;
+};
+#endif
+
 /* 
  * An entry in the lookup table in the WIM file. 
  *
@@ -48,7 +62,14 @@ struct lookup_table_entry {
        /* If %true, this lookup table entry corresponds to a symbolic link
         * reparse buffer.  @symlink_reparse_data_buf will give the target of
         * the symbolic link. */
-       bool is_symlink;
+       enum {
+               RESOURCE_NONEXISTENT = 0,
+               RESOURCE_IN_WIM,
+               RESOURCE_IN_FILE_ON_DISK,
+               RESOURCE_IN_STAGING_FILE,
+               RESOURCE_IN_ATTACHED_BUFFER,
+               RESOURCE_IN_NTFS_VOLUME,
+       } resource_location;
 
        /* Number of times this lookup table entry is referenced by dentries. */
        u32 refcnt;
@@ -72,32 +93,27 @@ struct lookup_table_entry {
         * It will not be compressed, and its size will be given by
         * resource_entry.size and resource_entry.original_size. */
        union {
+               WIMStruct *wim;
                char *file_on_disk;
                char *staging_file_name;
-               void *symlink_buf;
-               struct lookup_table_entry *next_lte_in_swm;
+               u8 *attached_buffer;
+       #ifdef WITH_NTFS_3G
+               struct ntfs_location *ntfs_loc;
+       #endif
        };
-
        union {
-               struct { /* Used for wimlib_export. */
-
-                       /* If (other_wim_fp != NULL), the file resource indicated
-                        * by this lookup table entry is in a different WIM
-                        * file, and other_wim_fp is the FILE* for it. */
-                       FILE *other_wim_fp;
-
-                       /* Compression type used in other WIM. */
-                       int   other_wim_ctype;
-               };
-
-               struct { /* Used for wimlib_mount */
-
-                       /* File descriptors table for this data stream */
-                       struct wimlib_fd **fds;
-                       u16 num_allocated_fds;
-                       u16 num_opened_fds;
-               };
+               struct lookup_table_entry *next_lte_in_swm;
+               FILE *file_on_disk_fp;
+       #ifdef WITH_NTFS_3G
+               ntfs_attr *attr;
+       #endif
        };
+#ifdef WITH_FUSE
+       /* File descriptors table for this data stream */
+       u16 num_opened_fds;
+       u16 num_allocated_fds;
+       struct wimlib_fd **fds;
+#endif
 
        /* When a WIM file is written, out_refcnt starts at 0 and is incremented
         * whenever the file resource pointed to by this lookup table entry
@@ -110,7 +126,10 @@ struct lookup_table_entry {
         * output_resource_entry is the struct resource_entry for the position of the
         * file resource when written to the output file. */
        u32 out_refcnt;
-       struct resource_entry output_resource_entry;
+       union {
+               struct resource_entry output_resource_entry;
+               char *extracted_file;
+       };
 
        /* Circular linked list of streams that share the same lookup table
         * entry
@@ -125,6 +144,30 @@ struct lookup_table_entry {
        struct list_head staging_list;
 };
 
+static inline u64 wim_resource_size(const struct lookup_table_entry *lte)
+{
+       return lte->resource_entry.original_size;
+}
+
+static inline u64
+wim_resource_compressed_size(const struct lookup_table_entry *lte)
+{
+       return lte->resource_entry.size;
+}
+
+/*
+ * XXX Probably should store the compression type directly in the lookup table
+ * entry
+ */
+static inline int
+wim_resource_compression_type(const struct lookup_table_entry *lte)
+{
+       if (!(lte->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
+           || lte->resource_location != RESOURCE_IN_WIM)
+               return WIM_COMPRESSION_TYPE_NONE;
+       return wimlib_get_compression_type(lte->wim);
+}
+
 
 extern struct lookup_table *new_lookup_table(size_t capacity);
 
@@ -164,10 +207,9 @@ extern int lookup_resource(WIMStruct *w, const char *path,
 
 extern int zero_out_refcnts(struct lookup_table_entry *entry, void *ignore);
 
-extern void print_lookup_table_entry(struct lookup_table_entry *entry);
+extern void print_lookup_table_entry(const struct lookup_table_entry *entry);
 
-extern int read_lookup_table(FILE *fp, u64 offset, u64 size, 
-                            struct lookup_table **table_ret);
+extern int read_lookup_table(WIMStruct *w);
 
 extern void free_lookup_table(struct lookup_table *table);