dentry_find_streams_to_extract(): Handle hard links correctly

[wimlib] / src / dentry.h

diff --git a/src/dentry.h b/src/dentry.h
index 1629111d83d1ccc5d662436aef09e7f0a2d00e98..a613db42c655c7d412194a533256c767aceb1ceb 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -147,8 +147,8 @@ struct wim_dentry {
         * including the terminating null character. */
        u32 full_path_nbytes;
 
-       /* Has this dentry been extracted yet? */
-       u8 is_extracted : 1;
+       /* Does this dentry need to be extracted? */
+       u8 needs_extraction : 1;
 
        /* Only used during NTFS capture */
        u8 is_win32_name : 1;
@@ -232,6 +232,8 @@ 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;
 
@@ -275,6 +277,9 @@ struct wim_inode {
        /* Inode number */
        u64 i_ino;
 
+       /* Device number, used only during image capture */
+       u64 i_devno;
+
        /* List of dentries that reference this inode (there should be
         * link_count of them) */
        struct list_head i_dentry;
@@ -284,15 +289,6 @@ struct wim_inode {
                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;
-
-               /* Device number, used only during image capture */
-               u64 i_devno;
-       };
-
        tchar *i_extracted_file;
 
        /* Root of a red-black tree storing the children of this inode (if
@@ -406,6 +402,9 @@ 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 int
+new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret);
+
 extern void
 free_inode(struct wim_inode *inode);
 
@@ -459,7 +458,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;