X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fdentry.h;h=40a4c8e67d7e259a5be7a69a2dd2e5a6dc63fa71;hp=794dba97f3e2842f2e5ce18e22398a8954b7d46b;hb=aa3a2830cd4154238bc6a342ffea43d9ac69a14c;hpb=cde4c44beca12261e17e635fda41fb750e2895b1

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index 794dba97..40a4c8e6 100644
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -9,13 +9,11 @@
 #include "wimlib/types.h"
 
 struct wim_inode;
-struct wim_lookup_table;
-struct wim_lookup_table_entry;
-struct wim_security_data;
+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
 
 /*
@@ -23,28 +21,18 @@ 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 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
@@ -64,6 +52,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,14 +75,6 @@ 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 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
@@ -89,39 +84,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;
-
-	/* 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;
+	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 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 +103,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,7 +128,13 @@ dentry_is_first_in_inode(const struct wim_dentry *dentry)
 	return inode_first_dentry(dentry->d_inode) == dentry;
 }
 
-extern u64
+static inline bool
+will_extract_dentry(const struct wim_dentry *dentry)
+{
+	return dentry->d_extraction_list_node.next != NULL;
+}
+
+extern size_t
 dentry_out_total_length(const struct wim_dentry *dentry);
 
 extern int
@@ -154,22 +142,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)				\
@@ -220,20 +214,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);
 
@@ -241,13 +221,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);
@@ -260,7 +239,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);
@@ -286,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