X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fdentry.h;h=025a56cdd48ecbc04f9beb1fb1f3d050998e3b53;hp=15decce02c955757071d558fff7b193e39b8e135;hb=4802321d3a42c3116fddc9ea41a878d031defd61;hpb=e45e06eefdf6dfe67378b619037412cdd3ad27e8 diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h index 15decce0..025a56cd 100644 --- a/include/wimlib/dentry.h +++ b/include/wimlib/dentry.h @@ -9,11 +9,11 @@ #include "wimlib/types.h" struct wim_inode; -struct wim_lookup_table; +struct blob_table; /* Base size of a WIM dentry in the on-disk format, up to and including the file * name length. This does not include the variable-length file name, short - * name, alternate data stream entries, and padding to 8-byte boundaries. */ + * name, extra stream entries, and padding to 8-byte boundaries. */ #define WIM_DENTRY_DISK_SIZE 102 /* @@ -21,28 +21,18 @@ struct wim_lookup_table; * tree for each image in the WIM. * * Note that this is a directory entry and not an inode. Since NTFS allows hard - * links, it's possible for an NTFS inode to correspond to multiple WIM dentries. - * The hard link group ID field of the on-disk WIM dentry tells us the number of - * the NTFS inode that the dentry corresponds to (and this gets placed in - * d_inode->i_ino). + * links, it's possible for an NTFS inode to correspond to multiple WIM + * dentries. The hard link group ID field of the on-disk WIM dentry tells us + * the number of the NTFS inode that the dentry corresponds to (and this gets + * placed in d_inode->i_ino). * * Unfortunately, WIM files do not have an analogue to an inode; instead certain - * information, such as file attributes, the security descriptor, and file - * streams is replicated in each hard-linked dentry, even though this - * information really is associated with an inode. In-memory, we fix up this - * flaw by allocating a `struct wim_inode' for each dentry that contains some of - * this duplicated information, then combining the inodes for each hard link - * group together. - * - * Confusingly, it's possible for stream information to be missing from a dentry - * in a hard link set, in which case the stream information needs to be gotten - * from one of the other dentries in the hard link set. In addition, it is - * possible for dentries to have inconsistent security IDs, file attributes, or - * file streams when they share the same hard link ID (don't even ask. I hope - * that Microsoft may have fixed this problem, since I've only noticed it in the - * 'install.wim' for Windows 7). For those dentries, we have to use the - * conflicting fields to split up the hard link groups. (See - * dentry_tree_fix_inodes() in inode_fixup.c.) + * information, such as file attributes, the security descriptor, and streams is + * replicated in each hard-linked dentry, even though this information really is + * associated with an inode. In-memory, we fix up this flaw by allocating a + * `struct wim_inode' for each dentry that contains some of this duplicated + * information, then combining the inodes for each hard link group together. + * (See dentry_tree_fix_inodes().) */ struct wim_dentry { /* Pointer to the inode for this dentry. This will contain some @@ -62,12 +52,12 @@ struct wim_dentry { * long names but share the same case insensitive long name. */ struct list_head d_ci_conflict_list; - /* The parent of this directory entry. */ + /* The parent of this directory entry. (The root is its own parent.) */ struct wim_dentry *d_parent; /* Linked list node that places this dentry in the list of aliases for * its inode (d_inode) */ - struct list_head d_alias; + struct hlist_node d_alias_node; /* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL * if this dentry has no short name. */ @@ -126,25 +116,19 @@ struct wim_dentry { * extracted as part of the current extraction operation. */ struct list_head d_extraction_list_node; - /* (Extraction only) Linked list node that connects all dentries being - * extracted as aliases of the same inode as part of the current - * extraction operation. */ - struct list_head d_extraction_alias_node; + /* (Extraction only) Pointer to the next alias for this dentry's inode + * that needs to be extracted as part of the current extraction + * operation, or NULL if this is the last alias. */ + struct wim_dentry *d_next_extraction_alias; }; -static inline bool -dentry_is_first_in_inode(const struct wim_dentry *dentry) -{ - return inode_first_dentry(dentry->d_inode) == dentry; -} - static inline bool will_extract_dentry(const struct wim_dentry *dentry) { return dentry->d_extraction_list_node.next != NULL; } -extern u64 +extern size_t dentry_out_total_length(const struct wim_dentry *dentry); extern int @@ -152,22 +136,28 @@ for_dentry_in_tree(struct wim_dentry *root, int (*visitor)(struct wim_dentry*, void*), void *args); -extern int -for_dentry_in_tree_depth(struct wim_dentry *root, - int (*visitor)(struct wim_dentry*, void*), - void *args); - /* Iterate through each @child dentry of the @dir directory inode, - * in sorted order (by case sensitive name). */ -#define for_inode_child(child, dir) \ - avl_tree_for_each_in_order((child), (dir)->i_children, \ + * in sorted order by case sensitive name. */ +#define for_inode_child(child, dir) \ + avl_tree_for_each_in_order((child), (dir)->i_children, \ struct wim_dentry, d_index_node) /* Iterate through each @child dentry of the @parent dentry, - * in sorted order (by case sensitive name). */ + * in sorted order by case sensitive name. */ #define for_dentry_child(child, parent) \ for_inode_child((child), (parent)->d_inode) +/* Iterate through each @child dentry of the @dir directory inode, + * in sorted order by case insensitive name. */ +#define for_inode_child_case_insensitive(child, dir) \ + avl_tree_for_each_in_order((child), (dir)->i_children_ci, \ + struct wim_dentry, d_index_node_ci) + +/* Iterate through each @child dentry of the @parent dentry, + * in sorted order by case insensitive name. */ +#define for_dentry_child_case_insensitive(child, parent) \ + for_inode_child_case_insensitive((child), (parent)->d_inode) + /* Iterate through each @child dentry of the @dir directory inode, * in postorder (safe for freeing the child dentries). */ #define for_inode_child_postorder(child, dir) \ @@ -225,13 +215,12 @@ extern tchar * dentry_full_path(struct wim_dentry *dentry); extern int -new_dentry(const tchar *name, struct wim_dentry **dentry_ret); - -extern int -new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret); +new_dentry_with_new_inode(const tchar *name, bool set_timestamps, + struct wim_dentry **dentry_ret); extern int -new_dentry_with_timeless_inode(const tchar *name, struct wim_dentry **dentry_ret); +new_dentry_with_existing_inode(const tchar *name, struct wim_inode *inode, + struct wim_dentry **dentry_ret); extern void dentry_tree_clear_inode_visited(struct wim_dentry *root); @@ -244,7 +233,7 @@ free_dentry(struct wim_dentry *dentry); extern void free_dentry_tree(struct wim_dentry *root, - struct wim_lookup_table *lookup_table); + struct blob_table *blob_table); extern void unlink_dentry(struct wim_dentry *dentry);