X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.h;h=5b2766f4a25f8fe694f48757316e4cdf613aaffc;hb=8ed5883780f52ea40dd47347a717dc4ccb7396c5;hp=c68d89adea6a6370c0986ce15e9d2b0565dba2f4;hpb=21a83b1b20f5ae138bc4bb9bdedd80a2a2d92c0a;p=wimlib

diff --git a/src/lookup_table.h b/src/lookup_table.h
index c68d89ad..5b2766f4 100644
--- 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,15 @@ struct lookup_table {
 
 struct wimlib_fd;
 
+typedef struct _ntfs_attr ntfs_attr;
+typedef struct _ntfs_volume ntfs_volume;
+struct ntfs_location {
+	ntfs_volume *vol;
+	char *path_utf8;
+	char *stream_name_utf16;
+	u16 stream_name_utf16_num_chars;
+};
+
 /* 
  * An entry in the lookup table in the WIM file. 
  *
@@ -54,6 +65,7 @@ struct lookup_table_entry {
 		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. */
@@ -82,9 +94,13 @@ struct lookup_table_entry {
 		char *file_on_disk;
 		char *staging_file_name;
 		u8 *attached_buffer;
+		struct ntfs_location *ntfs_loc;
+	};
+	union {
 		struct lookup_table_entry *next_lte_in_swm;
+		FILE *file_on_disk_fp;
+		ntfs_attr *attr;
 	};
-	FILE *file_on_disk_fp;
 #ifdef WITH_FUSE
 	/* File descriptors table for this data stream */
 	u16 num_opened_fds;
@@ -103,7 +119,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
@@ -123,11 +142,21 @@ 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->wim)
+	    || lte->resource_location != RESOURCE_IN_WIM)
 		return WIM_COMPRESSION_TYPE_NONE;
 	return wimlib_get_compression_type(lte->wim);
 }
@@ -171,7 +200,7 @@ 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(WIMStruct *w);