X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fdentry.h;h=1d869eae023c4979b30d8efcf0a1c2e3e24a9117;hp=bdbd5f753ccde41c2fee16e9a1e02bde4347b598;hb=dd3f804966f577b104eda649f572e8e765edc7ef;hpb=ced16a28e197645a40fa04a54793d117a04526d7 diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h index bdbd5f75..1d869eae 100644 --- a/include/wimlib/dentry.h +++ b/include/wimlib/dentry.h @@ -10,8 +10,6 @@ struct wim_inode; struct wim_lookup_table; -struct wim_lookup_table_entry; -struct wim_security_data; /* 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 @@ -23,7 +21,7 @@ struct wim_security_data; * 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 a NTFS inode to correspond to multiple WIM dentries. + * 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). @@ -64,6 +62,21 @@ 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 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; + + /* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL + * if this dentry has no short name. */ + utf16lechar *short_name; + + /* Pointer to the UTF-16LE filename (malloc()ed buffer), or NULL if this + * dentry has no filename. */ + utf16lechar *file_name; + /* Length of UTF-16LE encoded short filename, in bytes, not including * the terminating zero wide-character. */ u16 short_name_nbytes; @@ -72,15 +85,7 @@ struct wim_dentry { * the terminating null character. */ u16 file_name_nbytes; - /* Length of full path name encoded using "tchars", in bytes, not - * including the terminating null character. */ - u32 full_path_nbytes; - - /* During extraction extractions, this flag will be set after the - * "skeleton" of the dentry has been extracted. */ - u8 skeleton_extracted : 1; - - /* When capturing from a NTFS volume using NTFS-3g, this flag is set on + /* When capturing from an NTFS volume using NTFS-3g, this flag is set on * dentries that were created from a filename in the WIN32 or WIN32+DOS * namespaces rather than the POSIX namespace. Otherwise this will * always be 0. */ @@ -89,39 +94,18 @@ struct wim_dentry { /* Temporary flag; always reset to 0 when done using. */ u8 tmp_flag : 1; - /* Set to 1 if this name was extracted as a link, so no streams need to - * be extracted to it. */ - u8 was_linked : 1; - /* Used by wimlib_update_image() */ u8 is_orphan : 1; - /* Temporary list field */ - struct list_head tmp_list; - - /* Links list of dentries being extracted */ - struct list_head extraction_list; - - /* Linked list node that places this dentry in the list of aliases for - * its inode (d_inode) */ - struct list_head d_alias; + union { + /* 'subdir_offset' is only used while reading and writing this + * dentry. See the corresponding field in `struct + * wim_dentry_on_disk' for explanation. */ + u64 subdir_offset; - /* The parent of this directory entry. */ - struct wim_dentry *parent; - - /* 'length' and 'subdir_offset' are only used while reading and writing - * this dentry; see the corresponding field in - * `struct wim_dentry_on_disk' for explanation. */ - u64 length; - u64 subdir_offset; - - /* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL - * if this dentry has no short name. */ - utf16lechar *short_name; - - /* Pointer to the UTF-16LE filename (malloc()ed buffer), or NULL if this - * dentry has no filename. */ - utf16lechar *file_name; + /* Temporary list field */ + struct list_head tmp_list; + }; /* Full path to this dentry in the WIM, in platform-dependent tchars * that can be printed without conversion. By default this field will @@ -129,15 +113,23 @@ struct wim_dentry { * calculate_dentry_full_path() or dentry_full_path() functions. */ tchar *_full_path; - /* (Extraction only) Actual name to extract this dentry as, along with - * its length in tchars excluding the NULL terminator. This usually - * will be the same as file_name, with the character encoding converted - * if needed. But if file_name contains characters not accepted on the - * current platform, then this may be set slightly differently from - * file_name. This will be either NULL or a malloc()ed buffer that may - * alias file_name. */ - tchar *extraction_name; - size_t extraction_name_nchars; + /* (Extraction only) Actual name to extract this dentry as. This may be + * either in 'tchars' or in 'utf16lechars', depending on what encoding + * the extraction backend needs. This may alias 'file_name'. If it + * doesn't, it is an allocated buffer which must be freed. */ + void *d_extraction_name; + + /* (Extraction only) Number of characters in d_extraction_name. */ + size_t d_extraction_name_nchars; + + /* (Extraction only) Linked list node that connects all dentries being + * 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; }; static inline bool @@ -146,6 +138,12 @@ 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 dentry_out_total_length(const struct wim_dentry *dentry); @@ -154,11 +152,6 @@ 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) \ @@ -220,20 +213,6 @@ extern struct wim_dentry * get_parent_dentry(struct WIMStruct *wim, const tchar *path, CASE_SENSITIVITY_TYPE case_type); -#ifdef WITH_FUSE - -#define LOOKUP_FLAG_ADS_OK 0x00000001 -#define LOOKUP_FLAG_DIRECTORY_OK 0x00000002 - -extern int -wim_pathname_to_stream(WIMStruct *wim, - const tchar *path, - int lookup_flags, - struct wim_dentry **dentry_ret, - struct wim_lookup_table_entry **lte_ret, - u16 *stream_idx_ret); -#endif - extern int calculate_dentry_full_path(struct wim_dentry *dentry); @@ -258,9 +237,6 @@ new_filler_directory(struct wim_dentry **dentry_ret); extern void free_dentry(struct wim_dentry *dentry); -extern void -put_dentry(struct wim_dentry *dentry); - extern void free_dentry_tree(struct wim_dentry *root, struct wim_lookup_table *lookup_table); @@ -289,7 +265,7 @@ write_dentry_tree(struct wim_dentry *root, u8 *p); static inline bool dentry_is_root(const struct wim_dentry *dentry) { - return dentry->parent == dentry; + return dentry->d_parent == dentry; } static inline bool @@ -315,7 +291,4 @@ dentry_has_long_name(const struct wim_dentry *dentry) { return dentry->file_name_nbytes != 0; } - -extern int -dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list); #endif /* _WIMLIB_DENTRY_H */