struct wim_inode *d_inode;
/* Node for the parent's balanced binary search tree of child dentries
- * sorted by case sensitive long name (root i_children). */
+ * keyed by filename (root i_children). */
struct avl_tree_node d_index_node;
- /* Node for the parent's balanced binary search tree of child dentries,
- * sorted by case insensitive long name (root i_children_ci). */
- struct avl_tree_node d_index_node_ci;
-
- /* List of dentries in a directory that have different case sensitive
- * 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;
* its inode (d_inode) */
struct hlist_node d_alias_node;
+ /* Pointer to the UTF-16LE filename (malloc()ed buffer), or NULL if this
+ * dentry has no filename. */
+ utf16lechar *d_name;
+
/* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL
* if this dentry has no short name. */
- utf16lechar *short_name;
+ utf16lechar *d_short_name;
- /* Pointer to the UTF-16LE filename (malloc()ed buffer), or NULL if this
- * dentry has no filename. */
- utf16lechar *file_name;
+ /* Length of 'd_name' in bytes, excluding the terminating null */
+ u16 d_name_nbytes;
- /* Length of UTF-16LE encoded short filename, in bytes, not including
- * the terminating zero wide-character. */
- u16 short_name_nbytes;
+ /* Length of 'd_short_name' in bytes, excluding the terminating null */
+ u16 d_short_name_nbytes;
- /* Length of UTF-16LE encoded "long" file name, in bytes, not including
- * the terminating null character. */
- u16 file_name_nbytes;
+ /* (Extraction only) Length of 'd_extraction_name' in _characters_,
+ * excluding the terminating null */
+ u16 d_extraction_name_nchars;
- /* When capturing from an 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. */
- u8 is_win32_name : 1;
+ u16 d_is_win32_name : 1;
/* Temporary flag; always reset to 0 when done using. */
- u8 tmp_flag : 1;
+ u16 d_tmp_flag : 1;
/* Used by wimlib_update_image() */
- u8 is_orphan : 1;
+ u16 d_is_orphan : 1;
union {
- /* 'subdir_offset' is only used while reading and writing this
+ /* The 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;
+ u64 d_subdir_offset;
/* Temporary list field */
- struct list_head tmp_list;
+ struct list_head d_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
* be NULL and will only be calculated on-demand by the
* calculate_dentry_full_path() or dentry_full_path() functions. */
- tchar *_full_path;
+ tchar *d_full_path;
/* (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
+ * the extraction backend needs. This may alias 'd_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) Pointer to the next alias for this dentry's inode
+ /* (Extraction only) Pointer to the next alias of 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;
+
+#ifdef ENABLE_TEST_SUPPORT
+ struct wim_dentry *d_corresponding;
+#endif
};
static inline bool
extern int
for_dentry_in_tree(struct wim_dentry *root,
- int (*visitor)(struct wim_dentry*, void*),
- void *args);
+ 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. */
+/* Iterate through each @child dentry of the @dir directory inode in
+ * collation order. */
#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. */
+/* Iterate through each @child dentry of the @parent dentry in
+ * collation order. */
#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). */
+/* 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) \
avl_tree_for_each_in_postorder((child), (dir)->i_children, \
struct wim_dentry, d_index_node)
-/* Iterate through each @child dentry of the @parent dentry,
- * in postorder (safe for freeing the child dentries). */
+/* Iterate through each @child dentry of the @parent dentry in
+ * postorder (safe for freeing the child dentries). */
#define for_dentry_child_postorder(child, parent) \
for_inode_child_postorder((child), (parent)->d_inode)
#define dentry_any_child(parent) \
inode_any_child((parent)->d_inode)
+extern struct wim_dentry *
+dentry_get_first_ci_match(struct wim_dentry *dentry);
+
+extern struct wim_dentry *
+dentry_get_next_ci_match(struct wim_dentry *dentry,
+ struct wim_dentry *ci_match);
+
+/* Iterate through all other dentries which have the same case insensitive name
+ * as the one given. */
+#define dentry_for_each_ci_match(ci_match, dentry) \
+ for ((ci_match) = dentry_get_first_ci_match((dentry)); \
+ (ci_match); \
+ (ci_match) = dentry_get_next_ci_match((dentry), (ci_match)))
+
extern void
calculate_subdir_offsets(struct wim_dentry *root, u64 *subdir_offset_p);
extern int
-dentry_set_name(struct wim_dentry *dentry, const tchar *new_name);
+dentry_set_name(struct wim_dentry *dentry, const tchar *name);
extern int
-dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *new_name,
- size_t new_name_nbytes);
+dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *name,
+ size_t name_nbytes);
extern struct wim_dentry *
-get_dentry(struct WIMStruct *wim, const tchar *path,
- CASE_SENSITIVITY_TYPE case_type);
+get_dentry(WIMStruct *wim, const tchar *path, CASE_SENSITIVITY_TYPE case_type);
extern struct wim_dentry *
-get_dentry_child_with_name(const struct wim_dentry *dentry,
- const tchar *name,
+get_dentry_child_with_name(const struct wim_dentry *dentry, const tchar *name,
CASE_SENSITIVITY_TYPE case_type);
extern struct wim_dentry *
CASE_SENSITIVITY_TYPE case_type);
extern struct wim_dentry *
-get_parent_dentry(struct WIMStruct *wim, const tchar *path,
+get_parent_dentry(WIMStruct *wim, const tchar *path,
CASE_SENSITIVITY_TYPE case_type);
extern int
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);
-
extern int
new_filler_directory(struct wim_dentry **dentry_ret);
free_dentry(struct wim_dentry *dentry);
extern void
-free_dentry_tree(struct wim_dentry *root,
- struct blob_table *blob_table);
+free_dentry_tree(struct wim_dentry *root, struct blob_table *blob_table);
extern void
unlink_dentry(struct wim_dentry *dentry);
}
static inline bool
-dentry_has_short_name(const struct wim_dentry *dentry)
+dentry_has_long_name(const struct wim_dentry *dentry)
{
- return dentry->short_name_nbytes != 0;
+ return dentry->d_name_nbytes != 0;
}
static inline bool
-dentry_has_long_name(const struct wim_dentry *dentry)
+dentry_has_short_name(const struct wim_dentry *dentry)
{
- return dentry->file_name_nbytes != 0;
+ return dentry->d_short_name_nbytes != 0;
}
+
#endif /* _WIMLIB_DENTRY_H */
git://wimlib.net / wimlib / blobdiff