Extract WIM hard links correctly

[wimlib] / src / dentry.h

diff --git a/src/dentry.h b/src/dentry.h
index 50021322f5cbbe0d6e1eebf15d377b3c5bd0b2cb..16cf5f37bba23200891fac458fca6e6f21385b79 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -114,7 +114,6 @@ struct dentry {
         * included only the length field, but that takes up 8 bytes. */
        u64 length;
 
-
        /* The file attributes associated with this file. */
        u32 attributes;
 
@@ -153,14 +152,6 @@ struct dentry {
         * read_dentry() function. */
        //u32 reparse_reserved;
 
-       /* If the reparse_reserved field existed, there would be a 4-byte gap
-        * here to align hard_link on an 8-byte field.  However,
-        * reparse_reserved does not actually exist, so there is no gap here. */
-
-       /* If the file is part of a hard link set, all the directory entries in
-        * the set will share the same value for this field. */
-       u64 hard_link;
-
        /* Number of alternate data streams associated with this file. */
        u16 num_ads;
 
@@ -192,12 +183,40 @@ struct dentry {
        /* Alternate stream entries for this dentry. */
        struct ads_entry *ads_entries;
 
-       /* Number of references to the dentry tree itself, as in multiple
-        * WIMStructs */
-       int refcnt;
+       union {
+               /* Number of references to the dentry tree itself, as in multiple
+                * WIMStructs */
+               int refcnt;
+
+               /* Number of times this dentry has been opened (only for
+                * directories!) */
+               u32 num_times_opened;
+       };
+
+       /* If the file is part of a hard link set, all the directory entries in
+        * the set will share the same value for this field. */
+       u64 hard_link;
+
+       enum {
+               /* This dentry is the owner of its ads_entries, although it may
+                * be in a hard link set */
+               GROUP_INDEPENDENT,
+
+               /* This dentry is the owner of the ads_entries in the hard link
+                * set */
+               GROUP_MASTER,
+
+               /* This dentry shares its ads_entries with a dentry in the hard
+                * link set that has GROUP_MASTER set. */
+               GROUP_SLAVE
+       } link_group_master_status;
+
 
        /* List of dentries in the hard link set */
        struct list_head link_group_list;
+
+       /* Path to extracted file on disk (used during extraction only) */
+       char *extracted_file;
 };
 
 /* Return hash of the "unnamed" (default) data stream. */
@@ -213,12 +232,14 @@ static inline const u8 *dentry_hash(const struct dentry *dentry)
        return dentry->hash;
 }
 
-static inline size_t dentry_link_group_size(struct dentry *dentry)
+static inline size_t dentry_link_group_size(const struct dentry *dentry)
 {
+       const struct list_head *cur = &dentry->link_group_list;
        size_t size = 0;
-       struct list_head *list;
-       list_for_each(list, &dentry->link_group_list)
+       do {
                size++;
+               cur = cur->next;
+       } while (cur != &dentry->link_group_list);
        return size;
 }
 
@@ -236,8 +257,8 @@ extern u64 dentry_total_length(const struct dentry *dentry);
 
 extern void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry);
 
-extern void dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf, 
-                           const struct lookup_table *table);
+extern int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf, 
+                          const struct lookup_table *table);
 
 extern int for_dentry_in_tree(struct dentry *root, 
                              int (*visitor)(struct dentry*, void*), 
@@ -249,6 +270,9 @@ extern int for_dentry_in_tree_depth(struct dentry *root,
 
 extern int calculate_dentry_full_path(struct dentry *dentry, void *ignore);
 extern void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p);
+extern int get_names(char **name_utf16_ret, char **name_utf8_ret,
+                    u16 *name_utf16_len_ret, u16 *name_utf8_len_ret,
+                    const char *name);
 extern int change_dentry_name(struct dentry *dentry, const char *new_name);
 extern int change_ads_name(struct ads_entry *entry, const char *new_name);
 
@@ -266,7 +290,12 @@ extern void dentry_update_all_timestamps(struct dentry *dentry);
 extern void init_dentry(struct dentry *dentry, const char *name);
 extern struct dentry *new_dentry(const char *name);
 
+extern void dentry_free_ads_entries(struct dentry *dentry);
 extern void free_dentry(struct dentry *dentry);
+extern void put_dentry(struct dentry *dentry);
+extern int share_dentry_ads(struct dentry *master,
+                           struct dentry *slave);
+extern struct dentry *clone_dentry(struct dentry *old);
 extern void free_dentry_tree(struct dentry *root,
                             struct lookup_table *lookup_table, 
                             bool lt_decrement_refcnt);
@@ -288,8 +317,6 @@ extern int read_dentry_tree(const u8 metadata_resource[],
 
 extern u8 *write_dentry_tree(const struct dentry *tree, u8 *p);
 
-extern int dentry_set_symlink_buf(struct dentry *dentry,
-                                 const u8 symlink_buf_hash[]);
 
 /* Inline utility functions for WIMDentries */