#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
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.
*
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. */
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;
* 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
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);
}
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);
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)
{
if (lte)
return lte->hash;
else
- return NULL;
+ return zero_hash;
}
/*
}
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