X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.h;h=58adb5e681a9022b599be911d90219097d96f4a9;hp=3c59f128f675f514bbc001af148e1c6bc1430acb;hb=143db75c035e6ecaca451ce70a4ed58a01102b43;hpb=9fb3aaca115429b0af2a623bf20bfceef74f047f diff --git a/src/dentry.h b/src/dentry.h index 3c59f128..58adb5e6 100644 --- a/src/dentry.h +++ b/src/dentry.h @@ -78,14 +78,16 @@ struct wim_ads_entry { * terminating null character. */ u16 stream_name_nbytes; - /* Stream name (UTF-16LE) */ - utf16lechar *stream_name; - -#ifdef WITH_FUSE /* Number to identify an alternate data stream even after it's possibly * been moved or renamed. */ u32 stream_id; -#endif + + /* Stream name (UTF-16LE) */ + utf16lechar *stream_name; + + /* Unused field. We read it into memory so we can write it out + * unchanged. */ + u64 unused; }; @@ -141,9 +143,11 @@ struct wim_dentry { * the terminating null character. */ u16 file_name_nbytes; - /* Length of full path name, in bytes, as a multibyte-encoded string */ + /* Length of full path name encoded using "tchars", in bytes, not + * including the terminating null character. */ u32 full_path_nbytes; + /* Has this dentry been extracted yet? */ u8 is_extracted : 1; /* Only used during NTFS capture */ @@ -184,10 +188,6 @@ struct wim_dentry { * points. */ u64 subdir_offset; - /* Number of references to the dentry tree itself, as in multiple - * WIMStructs */ - u32 refcnt; - /* Pointer to the UTF-16LE short filename (malloc()ed buffer) */ utf16lechar *short_name; @@ -195,7 +195,7 @@ struct wim_dentry { utf16lechar *file_name; /* Full path of this dentry */ - mbchar *full_path; + tchar *_full_path; }; #define rbnode_dentry(node) container_of(node, struct wim_dentry, rb_node) @@ -232,12 +232,26 @@ struct wim_inode { /* %true iff verify_inode() has run on this inode. */ u8 i_verified : 1; + u8 i_visited : 1; + /* Used only in NTFS-mode extraction */ u8 i_dos_name_extracted : 1; + /* Set to 0 if reparse point fixups have been done. Otherwise set to 1. + * + * Note: this actually may reflect the SYMBOLIC_LINK_RELATIVE flag. */ + u16 i_not_rpfixed; + /* Number of alternate data streams associated with this inode */ u16 i_num_ads; + /* Unused/unknown fields that we just read into memory so we can + * re-write them unchanged. */ + u64 i_unused_1; + u64 i_unused_2; + u32 i_rp_unknown_1; + u16 i_rp_unknown_2; + /* 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. * @@ -267,30 +281,35 @@ struct wim_inode { * link_count of them) */ struct list_head i_dentry; - struct hlist_node i_hlist; + union { + struct hlist_node i_hlist; + struct list_head i_list; + }; + + union { + /* Used during image extraction to build a list of inodes that + * share a certain stream */ + struct list_head i_lte_inode_list; - struct list_head i_lte_inode_list; + /* Device number, used only during image capture */ + u64 i_devno; + }; -#ifdef __WIN32__ - utf16lechar *i_extracted_file; -#else - mbchar *i_extracted_file; -#endif + tchar *i_extracted_file; /* Root of a red-black tree storing the children of this inode (if * non-empty, implies the inode is a directory, although that is also * noted in the @attributes field.) */ struct rb_root i_children; + /* Next alternate data stream ID to be assigned */ + u32 i_next_stream_id; + #ifdef WITH_FUSE /* wimfs file descriptors table for the inode */ u16 i_num_opened_fds; u16 i_num_allocated_fds; struct wimfs_fd **i_fds; - - /* Next alternate data stream ID to be assigned */ - u32 i_next_stream_id; - /* This mutex protects the inode's file descriptors table during * read-only mounts. Read-write mounts are still restricted to 1 * thread. */ @@ -341,24 +360,21 @@ for_dentry_in_tree_depth(struct wim_dentry *root, int (*visitor)(struct wim_dentry*, void*), void *args); -extern int -calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore); - extern void calculate_subdir_offsets(struct wim_dentry *dentry, u64 *subdir_offset_p); extern int -set_dentry_name(struct wim_dentry *dentry, const mbchar *new_name); +set_dentry_name(struct wim_dentry *dentry, const tchar *new_name); extern struct wim_dentry * -get_dentry(struct WIMStruct *w, const mbchar *path); +get_dentry(struct WIMStruct *w, const tchar *path); extern struct wim_inode * -wim_pathname_to_inode(struct WIMStruct *w, const mbchar *path); +wim_pathname_to_inode(struct WIMStruct *w, const tchar *path); extern struct wim_dentry * get_dentry_child_with_name(const struct wim_dentry *dentry, - const mbchar *name); + const tchar *name); extern struct wim_dentry * get_dentry_child_with_utf16le_name(const struct wim_dentry *dentry, @@ -366,7 +382,7 @@ get_dentry_child_with_utf16le_name(const struct wim_dentry *dentry, size_t name_nbytes); extern struct wim_dentry * -get_parent_dentry(struct WIMStruct *w, const mbchar *path); +get_parent_dentry(struct WIMStruct *w, const tchar *path); extern int print_dentry(struct wim_dentry *dentry, void *lookup_table); @@ -375,13 +391,22 @@ extern int print_dentry_full_path(struct wim_dentry *entry, void *ignore); extern int -new_dentry(const mbchar *name, struct wim_dentry **dentry_ret); +calculate_dentry_tree_full_paths(struct wim_dentry *root); + +extern tchar * +dentry_full_path(struct wim_dentry *dentry); + +extern struct wim_inode * +new_timeless_inode(); extern int -new_dentry_with_inode(const mbchar *name, struct wim_dentry **dentry_ret); +new_dentry(const tchar *name, struct wim_dentry **dentry_ret); extern int -new_dentry_with_timeless_inode(const mbchar *name, struct wim_dentry **dentry_ret); +new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret); + +extern int +new_dentry_with_timeless_inode(const tchar *name, struct wim_dentry **dentry_ret); extern void free_inode(struct wim_inode *inode); @@ -396,18 +421,15 @@ extern void free_dentry_tree(struct wim_dentry *root, struct wim_lookup_table *lookup_table); -extern int -increment_dentry_refcnt(struct wim_dentry *dentry, void *ignore); - extern void unlink_dentry(struct wim_dentry *dentry); -extern bool +extern struct wim_dentry * dentry_add_child(struct wim_dentry * restrict parent, struct wim_dentry * restrict child); extern struct wim_ads_entry * -inode_get_ads_entry(struct wim_inode *inode, const mbchar *stream_name, +inode_get_ads_entry(struct wim_inode *inode, const tchar *stream_name, u16 *idx_ret); extern struct wim_ads_entry * @@ -416,13 +438,17 @@ inode_add_ads_utf16le(struct wim_inode *inode, size_t stream_name_nbytes); extern struct wim_ads_entry * -inode_add_ads(struct wim_inode *dentry, const mbchar *stream_name); +inode_add_ads(struct wim_inode *dentry, const tchar *stream_name); extern int -inode_add_ads_with_data(struct wim_inode *inode, const mbchar *name, +inode_add_ads_with_data(struct wim_inode *inode, const tchar *name, const void *value, size_t size, struct wim_lookup_table *lookup_table); +extern int +inode_set_unnamed_stream(struct wim_inode *inode, const void *data, size_t len, + struct wim_lookup_table *lookup_table); + extern void inode_remove_ads(struct wim_inode *inode, u16 idx, struct wim_lookup_table *lookup_table); @@ -435,7 +461,7 @@ inode_remove_ads(struct wim_inode *inode, u16 idx, #define WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES (sizeof(WIMLIB_UNIX_DATA_TAG_UTF16LE) - 1) /* Format for special alternate data stream entries to store UNIX data for files - * and directories (see: WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) */ + * and directories (see: WIMLIB_ADD_FLAG_UNIX_DATA) */ struct wimlib_unix_data { u16 version; /* Must be 0 */ u16 uid; @@ -499,8 +525,8 @@ static inline bool inode_is_symlink(const struct wim_inode *inode) { return (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) - && ((inode->i_reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK) || - inode->i_reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT); + && (inode->i_reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK || + inode->i_reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT); } static inline bool