X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fdentry.h;h=05cb8c3f9d762b33981e7f98b5657afa2f202968;hp=6e58fd21ea07f6314bd04c7c2408477d153794f1;hb=9713bcb2d2ef098a0286df35909b5637e0db372a;hpb=00ae9e9cf11e1f7a108b63db0fc538180a81880a

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index 6e58fd21..05cb8c3f 100644
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -1,17 +1,15 @@
 #ifndef _WIMLIB_DENTRY_H
 #define _WIMLIB_DENTRY_H
 
+#include "wimlib/avl_tree.h"
 #include "wimlib/case.h"
 #include "wimlib/compiler.h"
 #include "wimlib/inode.h"
 #include "wimlib/list.h"
-#include "wimlib/rbtree.h"
 #include "wimlib/types.h"
 
 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).
@@ -52,17 +50,32 @@ struct wim_dentry {
 	 * to all dentries in a hard link group.  */
 	struct wim_inode *d_inode;
 
-	/* Node for the parent's red-black tree of child dentries, sorted by
-	 * case sensitive long name. */
-	struct rb_node rb_node;
+	/* Node for the parent's balanced binary search tree of child dentries
+	 * sorted by case sensitive long name (root i_children).  */
+	struct avl_tree_node d_index_node;
 
-	/* Node for the parent's red-black tree of child dentries, sorted by
-	 * case insensitive long name. */
-	struct rb_node rb_node_case_insensitive;
+	/* 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 case_insensitive_conflict_list;
+	 * 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. */
@@ -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,36 +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;
-
-	/* 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;
-
-	/* The parent of this directory entry. */
-	struct wim_dentry *parent;
+	/* Used by wimlib_update_image()  */
+	u8 is_orphan : 1;
 
-	/* '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;
+	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;
 
-	/* 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
@@ -126,18 +113,24 @@ 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;
 
-#define rbnode_dentry(node) container_of(node, struct wim_dentry, rb_node)
+	/* (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
 dentry_is_first_in_inode(const struct wim_dentry *dentry)
@@ -145,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);
 
@@ -153,37 +152,48 @@ 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 @parent inode,
- * in sorted order (by case sensitive name).  */
-#define for_inode_child(child, parent)						\
-	for (struct rb_node *_tmp = rb_first(&parent->i_children);		\
-	     _tmp &&								\
-		((child = rb_entry(_tmp, struct wim_dentry, rb_node)), 1);	\
-	     _tmp = rb_next(_tmp))
+/* 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,		\
+				   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)
+	for_inode_child((child), (parent)->d_inode)
 
-/* Iterate through each @child dentry of the @parent inode,
- * in postorder (safe for freeing).  */
-#define for_inode_child_postorder(child, parent)					\
-	for (struct rb_node *_tmp = rb_first_postorder(&parent->i_children), *_parent;	\
-	     _tmp &&									\
-		((child = rb_entry(_tmp, struct wim_dentry, rb_node)), 1) &&		\
-		((_parent = rb_parent(_tmp)), 1);					\
-	     _tmp = rb_next_postorder(_tmp, _parent))
+/* 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 postorder (safe for freeing).  */
+ * 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)				\
+	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).  */
 #define for_dentry_child_postorder(child, parent) \
-	for_inode_child_postorder(child, parent->d_inode)
+	for_inode_child_postorder((child), (parent)->d_inode)
+
+/* Get any child dentry of the @dir directory inode.  Requires
+ * inode_has_children(@dir) == true.  */
+#define inode_any_child(dir)	\
+	avl_tree_entry((dir)->i_children, struct wim_dentry, d_index_node)
+
+/* Get any child dentry of the @parent dentry.  Requires
+ * dentry_has_children(@parent) == true.  */
+#define dentry_any_child(parent) \
+	inode_any_child((parent)->d_inode)
 
 extern void
 calculate_subdir_offsets(struct wim_dentry *root, u64 *subdir_offset_p);
@@ -191,6 +201,10 @@ calculate_subdir_offsets(struct wim_dentry *root, u64 *subdir_offset_p);
 extern int
 dentry_set_name(struct wim_dentry *dentry, const tchar *new_name);
 
+extern int
+dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *new_name,
+			size_t new_name_nbytes);
+
 extern struct wim_dentry *
 get_dentry(struct WIMStruct *wim, const tchar *path,
 	   CASE_SENSITIVITY_TYPE case_type);
@@ -210,26 +224,9 @@ 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);
 
-extern int
-calculate_dentry_tree_full_paths(struct wim_dentry *root);
-
 extern tchar *
 dentry_full_path(struct wim_dentry *dentry);
 
@@ -246,14 +243,11 @@ extern void
 dentry_tree_clear_inode_visited(struct wim_dentry *root);
 
 extern int
-new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret);
+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);
@@ -262,12 +256,14 @@ extern void
 unlink_dentry(struct wim_dentry *dentry);
 
 extern struct wim_dentry *
-dentry_add_child(struct wim_dentry * restrict parent,
-		 struct wim_dentry * restrict child);
+dentry_add_child(struct wim_dentry *parent, struct wim_dentry *child);
+
+struct update_command_journal;
 
 extern int
 rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to,
-		CASE_SENSITIVITY_TYPE case_type);
+		CASE_SENSITIVITY_TYPE case_type,
+		struct update_command_journal *j);
 
 
 extern int
@@ -280,7 +276,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
@@ -306,7 +302,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 */