X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.h;h=d634abcdc61173519f8f58fe016fe837bd500e7d;hb=1dde5fb0d809f2f5e032e4d5241d1cb15ff3eb65;hp=26832a50f73c937263082edb82a7eb7e1e622f96;hpb=da2c501c4ca54063126290c2103f607e926c9989;p=wimlib diff --git a/src/dentry.h b/src/dentry.h index 26832a50..d634abcd 100644 --- a/src/dentry.h +++ b/src/dentry.h @@ -4,6 +4,7 @@ #include "util.h" #include "config.h" #include "list.h" +#include "sha1.h" #include @@ -16,10 +17,6 @@ typedef struct WIMStruct WIMStruct; #define WIM_ADS_ENTRY_DISK_SIZE 38 -#ifndef WIM_HASH_SIZE -#define WIM_HASH_SIZE 20 -#endif - /* * Reparse tags documented at * http://msdn.microsoft.com/en-us/library/dd541667(v=prot.10).aspx @@ -52,10 +49,18 @@ typedef struct WIMStruct WIMStruct; #define FILE_ATTRIBUTE_ENCRYPTED 0x00004000 #define FILE_ATTRIBUTE_VIRTUAL 0x00010000 +struct lookup_table_entry; + /* Alternate data stream entry */ struct ads_entry { - /* SHA-1 message digest of stream contents */ - u8 hash[WIM_HASH_SIZE]; + union { + /* SHA-1 message digest of stream contents */ + u8 hash[SHA1_HASH_SIZE]; + + /* The corresponding lookup table entry (only for resolved + * streams) */ + struct lookup_table_entry *lte; + }; /* Length of stream name (UTF-16) */ u16 stream_name_len; @@ -68,6 +73,9 @@ struct ads_entry { /* Stream name (UTF-8) */ char *stream_name_utf8; + + /* Doubly linked list of streams that share the same lookup table entry */ + struct stream_list_head lte_group_list; }; static inline u64 ads_entry_length(const struct ads_entry *entry) @@ -83,8 +91,16 @@ static inline void destroy_ads_entry(struct ads_entry *entry) memset(entry, 0, sizeof(entry)); } +static inline bool ads_entry_has_name(const struct ads_entry *entry, + const char *name, size_t name_len) +{ + if (entry->stream_name_utf8_len != name_len) + return false; + return memcmp(entry->stream_name_utf8, name, name_len) == 0; +} + -/* In-memory structure for a directory entry. There is a directory tree for +/* In-memory structure for a WIM directory entry. There is a directory tree for * each image in the WIM. */ struct dentry { /* The parent of this directory entry. */ @@ -98,40 +114,56 @@ struct dentry { /* Pointer to a child of this directory entry. */ struct dentry *children; - /* Size of directory entry, in bytes. Typical size is around 104 to 120 - * bytes. */ - /* It is possible for the length field to be 0. This situation, which + /* Size of directory entry on disk, in bytes. Typical size is around + * 104 to 120 bytes. + * + * It is possible for the length field to be 0. This situation, which * is undocumented, indicates the end of a list of sibling nodes in a * directory. It also means the real length is 8, because the dentry - * included only the length field, but that takes up 8 bytes. */ + * included only the length field, but that takes up 8 bytes. + * + * The length here includes the base directory entry on disk as well as + * the long and short filenames. It does NOT include any alternate + * stream entries that may follow the directory entry, even though the + * size of those needs to be considered. + */ u64 length; - /* The file attributes associated with this file. */ u32 attributes; - /* The index of the node in the security table that contains this file's - * security information. If -1, no security information exists for this - * file. */ + /* The index of the security descriptor in the WIM image's table of + * security descriptors that contains this file's security information. + * If -1, no security information exists for this file. */ int32_t security_id; - /* The offset, from the start of the metadata section, of this directory - * entry's child files. 0 if the directory entry has no children. */ + /* The offset, from the start of the WIM metadata resource for this + * image, of this directory entry's child files. 0 if the directory + * entry has no children (as in the case of regular files or reparse + * points). */ u64 subdir_offset; - /* Reserved for future disuse. Currently ignoring these fields. */ - u64 unused1; - u64 unused2; - - /* Timestamps for the entry. The timestamps are the number of + /* Timestamps for the dentry. The timestamps are the number of * 100-nanosecond intervals that have elapsed since 12:00 A.M., January * 1st, 1601, UTC. */ u64 creation_time; u64 last_access_time; u64 last_write_time; - /* A hash of the file's contents. */ - u8 hash[WIM_HASH_SIZE]; + /* true if the dentry's lookup table entry has been resolved (i.e. the + * @lte field is valid, but the @hash field is not valid) */ + bool resolved; + + /* A hash of the file's contents, or a pointer to the lookup table entry + * for this dentry if the lookup table entries have been resolved. + * + * More specifically, this is for the un-named default file stream, as + * opposed to the alternate (named) file streams, which may have their + * own lookup table entries. */ + union { + u8 hash[SHA1_HASH_SIZE]; + struct lookup_table_entry *lte; + }; /* Identity of a reparse point. See * http://msdn.microsoft.com/en-us/library/windows/desktop/aa365503(v=vs.85).aspx @@ -145,14 +177,6 @@ struct dentry { * read_dentry() function. */ //u32 reparse_reserved; - /* If the reparse_reserved field existed, there would be a 4-byte gap - * here to align hard_link on an 8-byte field. However, - * reparse_reserved does not actually exist, so there is no gap here. */ - - /* If the file is part of a hard link set, all the directory entries in - * the set will share the same value for this field. */ - u64 hard_link; - /* Number of alternate data streams associated with this file. */ u16 num_ads; @@ -184,28 +208,63 @@ struct dentry { /* Alternate stream entries for this dentry. */ struct ads_entry *ads_entries; - /* Number of references to the dentry tree itself, as in multiple - * WIMStructs */ - int refcnt; + union { + /* Number of references to the dentry tree itself, as in multiple + * WIMStructs */ + u32 refcnt; + + /* Number of times this dentry has been opened (only for + * directories!) */ + u32 num_times_opened; + }; + + /* If the file is part of a hard link set, all the directory entries in + * the set will share the same value for this field. + * + * Unfortunately, in some WIMs it is NOT the case that all dentries that + * share this field are actually in the same hard link set, although the + * WIMs that wimlib writes maintain this restriction. */ + u64 hard_link; + + enum { + /* This dentry is the owner of its ads_entries, although it may + * be in a hard link set */ + ADS_ENTRIES_DEFAULT = 0, + + /* This dentry is the owner of the ads_entries in the hard link + * set */ + ADS_ENTRIES_OWNER, + + /* This dentry shares its ads_entries with a dentry in the hard + * link set that has ADS_ENTRIES_OWNER set. */ + ADS_ENTRIES_USER + } ads_entries_status; + /* List of dentries in the hard link set */ struct list_head link_group_list; + + /* List of dentries sharing the same lookup table entry */ + struct stream_list_head lte_group_list; + + /* Path to extracted file on disk (used during extraction only) */ + char *extracted_file; }; -/* Return hash of the "unnamed" (default) data stream. */ -static inline const u8 *dentry_hash(const struct dentry *dentry) + +/* Return the number of dentries in the hard link group */ +static inline size_t dentry_link_group_size(const struct dentry *dentry) { - /* If there are alternate data streams, the dentry hash field is zeroed - * out, and we need to find the hash in the un-named data stream (should - * be the first one, but check them in order just in case, and fall back - * to the dentry hash field if we can't find an unnamed data stream). */ - for (u16 i = 0; i < dentry->num_ads; i++) - if (dentry->ads_entries[i].stream_name_len == 0) - return dentry->ads_entries[i].hash; - return dentry->hash; + const struct list_head *cur = &dentry->link_group_list; + size_t size = 0; + wimlib_assert(cur != NULL); + do { + size++; + cur = cur->next; + } while (cur != &dentry->link_group_list); + return size; } - extern struct ads_entry *dentry_get_ads_entry(struct dentry *dentry, const char *stream_name); @@ -220,9 +279,6 @@ extern u64 dentry_total_length(const struct dentry *dentry); extern void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry); -extern void dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf, - const struct lookup_table *table); - extern int for_dentry_in_tree(struct dentry *root, int (*visitor)(struct dentry*, void*), void *args); @@ -233,6 +289,9 @@ extern int for_dentry_in_tree_depth(struct dentry *root, extern int calculate_dentry_full_path(struct dentry *dentry, void *ignore); extern void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p); +extern int get_names(char **name_utf16_ret, char **name_utf8_ret, + u16 *name_utf16_len_ret, u16 *name_utf8_len_ret, + const char *name); extern int change_dentry_name(struct dentry *dentry, const char *new_name); extern int change_ads_name(struct ads_entry *entry, const char *new_name); @@ -250,10 +309,12 @@ extern void dentry_update_all_timestamps(struct dentry *dentry); extern void init_dentry(struct dentry *dentry, const char *name); extern struct dentry *new_dentry(const char *name); +extern void dentry_free_ads_entries(struct dentry *dentry); extern void free_dentry(struct dentry *dentry); +extern void put_dentry(struct dentry *dentry); +extern struct dentry *clone_dentry(struct dentry *old); extern void free_dentry_tree(struct dentry *root, - struct lookup_table *lookup_table, - bool lt_decrement_refcnt); + struct lookup_table *lookup_table); extern int increment_dentry_refcnt(struct dentry *dentry, void *ignore); extern int decrement_dentry_refcnt(struct dentry *dentry, void *ignore); @@ -272,11 +333,8 @@ extern int read_dentry_tree(const u8 metadata_resource[], extern u8 *write_dentry_tree(const struct dentry *tree, u8 *p); -extern int dentry_set_symlink_buf(struct dentry *dentry, - const u8 symlink_buf_hash[]); - -/* Inline utility functions for WIMDentries */ +/* Inline utility functions for dentries */ static inline bool dentry_is_root(const struct dentry *dentry) {