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

diff --git a/src/lookup_table.h b/src/lookup_table.h
index 28037699..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