X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.h;h=4df2c6bd46e18bf723ce6af6c17c9056c6387581;hb=81be60d782a4b4b8ae2e40141fc42b6e0e2d2706;hp=871981430124d4f0c6ade031313847535457bae2;hpb=b0b65688a9fb875e464457ee6449b8793f0f8a03;p=wimlib diff --git a/src/lookup_table.h b/src/lookup_table.h index 87198143..4df2c6bd 100644 --- a/src/lookup_table.h +++ b/src/lookup_table.h @@ -2,6 +2,7 @@ #define _WIMLIB_LOOKUP_TABLE_H #include "wimlib_internal.h" #include "dentry.h" +#include "sha1.h" #include /* Size of each lookup table entry in the WIM file. */ @@ -23,7 +24,6 @@ struct lookup_table { struct wimlib_fd; - /* * An entry in the lookup table in the WIM file. * @@ -48,7 +48,13 @@ 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_location; /* Number of times this lookup table entry is referenced by dentries. */ u32 refcnt; @@ -56,7 +62,7 @@ struct lookup_table_entry { union { /* SHA1 hash of the file resource pointed to by this lookup * table entry */ - u8 hash[WIM_HASH_SIZE]; + u8 hash[SHA1_HASH_SIZE]; /* First 4 or 8 bytes of the SHA1 hash, used for inserting the * entry into the hash table. Since the SHA1 hashes can be @@ -72,32 +78,21 @@ 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; }; - 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_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 +105,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 +123,31 @@ 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); extern void lookup_table_insert(struct lookup_table *table, @@ -138,6 +161,7 @@ static inline void lookup_table_unlink(struct lookup_table *table, table->num_entries--; } + extern struct lookup_table_entry * lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[]); @@ -162,10 +186,9 @@ extern int lookup_resource(WIMStruct *w, const char *path, extern int zero_out_refcnts(struct lookup_table_entry *entry, void *ignore); -extern int print_lookup_table_entry(struct lookup_table_entry *entry, void *ignore); +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); @@ -195,4 +218,118 @@ static inline struct resource_entry* wim_metadata_resource_entry(WIMStruct *w) w->current_image - 1].metadata_lte->resource_entry; } +static inline struct lookup_table_entry * +dentry_stream_lte_resolved(const struct dentry *dentry, unsigned stream_idx) +{ + wimlib_assert(dentry->resolved); + wimlib_assert(stream_idx <= dentry->num_ads); + if (stream_idx == 0) + return dentry->lte; + else + return dentry->ads_entries[stream_idx - 1].lte; +} + +static inline struct lookup_table_entry * +dentry_stream_lte_unresolved(const struct dentry *dentry, unsigned stream_idx, + const struct lookup_table *table) +{ + wimlib_assert(!dentry->resolved); + wimlib_assert(stream_idx <= dentry->num_ads); + if (!table) + return NULL; + if (stream_idx == 0) + return __lookup_resource(table, dentry->hash); + else + return __lookup_resource(table, + dentry->ads_entries[ + stream_idx - 1].hash); +} +/* + * Returns the lookup table entry for stream @stream_idx of the dentry, where + * stream_idx = 0 means the default un-named file stream, and stream_idx >= 1 + * corresponds to an alternate data stream. + * + * This works for both resolved and un-resolved dentries. + */ +static inline struct lookup_table_entry * +dentry_stream_lte(const struct dentry *dentry, unsigned stream_idx, + const struct lookup_table *table) +{ + if (dentry->resolved) + return dentry_stream_lte_resolved(dentry, stream_idx); + else + return dentry_stream_lte_unresolved(dentry, stream_idx, table); +} + + +static inline const u8 *dentry_stream_hash_unresolved(const struct dentry *dentry, + unsigned stream_idx) +{ + wimlib_assert(!dentry->resolved); + wimlib_assert(stream_idx <= dentry->num_ads); + if (stream_idx == 0) + return dentry->hash; + else + return dentry->ads_entries[stream_idx - 1].hash; +} + +static inline const u8 *dentry_stream_hash_resolved(const struct dentry *dentry, + unsigned stream_idx) +{ + struct lookup_table_entry *lte; + lte = dentry_stream_lte_resolved(dentry, stream_idx); + if (lte) + return lte->hash; + else + return NULL; +} + +/* + * Returns the hash for stream @stream_idx of the dentry, where stream_idx = 0 + * means the default un-named file stream, and stream_idx >= 1 corresponds to an + * alternate data stream. + * + * This works for both resolved and un-resolved dentries. + */ +static inline const u8 *dentry_stream_hash(const struct dentry *dentry, + unsigned stream_idx) +{ + if (dentry->resolved) + return dentry_stream_hash_resolved(dentry, stream_idx); + else + return dentry_stream_hash_unresolved(dentry, stream_idx); +} + +static inline struct lookup_table_entry * +dentry_first_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; + } + return NULL; +} + +static inline struct lookup_table_entry * +dentry_first_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; + } + return NULL; +} + +extern struct lookup_table_entry * +dentry_first_lte(const struct dentry *dentry, const struct lookup_table *table); + #endif