Fix a couple random issues

[wimlib] / src / lookup_table.h

diff --git a/src/lookup_table.h b/src/lookup_table.h
index 280376994176c36c8ef44a999902b72fe7253f7d..f0ee25b78f2d89761352afaa4860a39e1f783312 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,16 @@ struct lookup_table {
 
 struct wimlib_fd;
 
+#ifdef WITH_NTFS_3G
+struct ntfs_location {
+       char *path_utf8;
+       char *stream_name_utf16;
+       u16 stream_name_utf16_num_chars;
+       struct _ntfs_volume **ntfs_vol_p;
+       bool is_reparse_point;
+};
+#endif
+
 /* 
  * An entry in the lookup table in the WIM file. 
  *
@@ -54,6 +66,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 +95,17 @@ struct lookup_table_entry {
                char *file_on_disk;
                char *staging_file_name;
                u8 *attached_buffer;
+       #ifdef WITH_NTFS_3G
+               struct ntfs_location *ntfs_loc;
+       #endif
+       };
+       union {
                struct lookup_table_entry *next_lte_in_swm;
+               FILE *file_on_disk_fp;
+       #ifdef WITH_NTFS_3G
+               struct _ntfs_attr *attr;
+       #endif
        };
-       FILE *file_on_disk_fp;
 #ifdef WITH_FUSE
        /* File descriptors table for this data stream */
        u16 num_opened_fds;
@@ -103,7 +124,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
@@ -268,6 +292,16 @@ static inline const u8 *dentry_stream_hash_unresolved(const struct dentry *dentr
                return dentry->ads_entries[stream_idx - 1].hash;
 }
 
+static inline u16 dentry_stream_name_len(const struct dentry *dentry,
+                                        unsigned stream_idx)
+{
+       wimlib_assert(stream_idx <= dentry->num_ads);
+       if (stream_idx == 0)
+               return 0;
+       else
+               return dentry->ads_entries[stream_idx - 1].stream_name_len;
+}
+
 static inline const u8 *dentry_stream_hash_resolved(const struct dentry *dentry,
                                                    unsigned stream_idx)
 {
@@ -276,7 +310,7 @@ static inline const u8 *dentry_stream_hash_resolved(const struct dentry *dentry,
        if (lte)
                return lte->hash;
        else
-               return NULL;
+               return zero_hash;
 }
 
 /* 
@@ -296,35 +330,30 @@ static inline const u8 *dentry_stream_hash(const struct dentry *dentry,
 }
 
 static inline struct lookup_table_entry *
-dentry_first_lte_resolved(const struct dentry *dentry)
+dentry_unnamed_lte_resolved(const struct dentry *dentry)
 {
-       struct lookup_table_entry *lte;
        wimlib_assert(dentry->resolved);
-
-       for (unsigned i = 0; i <= dentry->num_ads; i++) {
-               lte = dentry_stream_lte_resolved(dentry, i);
-               if (lte)
-                       return lte;
-       }
+       for (unsigned i = 0; i <= dentry->num_ads; i++)
+               if (dentry_stream_name_len(dentry, i) == 0 &&
+                    !is_zero_hash(dentry_stream_hash_resolved(dentry, i)))
+                       return dentry_stream_lte_resolved(dentry, i);
        return NULL;
 }
 
 static inline struct lookup_table_entry *
-dentry_first_lte_unresolved(const struct dentry *dentry,
-                           const struct lookup_table *table)
+dentry_unnamed_lte_unresolved(const struct dentry *dentry,
+                             const struct lookup_table *table)
 {
-       struct lookup_table_entry *lte;
        wimlib_assert(!dentry->resolved);
-
-       for (unsigned i = 0; i <= dentry->num_ads; i++) {
-               lte = dentry_stream_lte_unresolved(dentry, i, table);
-               if (lte)
-                       return lte;
-       }
+       for (unsigned i = 0; i <= dentry->num_ads; i++)
+               if (dentry_stream_name_len(dentry, i) == 0 &&
+                    !is_zero_hash(dentry_stream_hash_unresolved(dentry, i)))
+                       return dentry_stream_lte_unresolved(dentry, i, table);
        return NULL;
 }
 
 extern struct lookup_table_entry *
-dentry_first_lte(const struct dentry *dentry, const struct lookup_table *table);
+dentry_unnamed_lte(const struct dentry *dentry,
+                  const struct lookup_table *table);
 
 #endif