]> wimlib.net Git - wimlib/blobdiff - src/dentry.c
Make lookup table use hlist
[wimlib] / src / dentry.c
index cf77adc765c6180100c43cbea5726a844ca86881..98d117b953607848ce285ecf3b4627c7a47cc16c 100644 (file)
@@ -36,6 +36,7 @@
 #include "timestamp.h"
 #include "lookup_table.h"
 #include "sha1.h"
+#include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
@@ -51,14 +52,6 @@ static bool dentry_has_name(const struct dentry *dentry, const char *name,
        return memcmp(dentry->file_name_utf8, name, name_len) == 0;
 }
 
-static bool ads_entry_has_name(const struct ads_entry *entry,
-                              const char *name, size_t name_len)
-{
-       if (entry->stream_name_utf8_len != name_len)
-               return false;
-       return memcmp(entry->stream_name_utf8, name, name_len) == 0;
-}
-
 /* Real length of a dentry, including the alternate data stream entries, which
  * are not included in the dentry->length field... */
 u64 dentry_total_length(const struct dentry *dentry)
@@ -87,38 +80,6 @@ void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry)
                                   ((u64)stbuf->st_dev << (sizeof(ino_t) * 8));
 }
 
-/* Transfers file attributes from a struct dentry to a `stat' buffer. */
-void dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf, 
-                    const struct lookup_table *table)
-{
-       struct lookup_table_entry *lte;
-
-       if (dentry_is_symlink(dentry))
-               stbuf->st_mode = S_IFLNK | 0777;
-       else if (dentry_is_directory(dentry))
-               stbuf->st_mode = S_IFDIR | 0755;
-       else
-               stbuf->st_mode = S_IFREG | 0644;
-
-       if (table)
-               lte = __lookup_resource(table, dentry_hash(dentry));
-       else
-               lte = NULL;
-
-       if (lte) {
-               stbuf->st_nlink = lte->refcnt;
-               stbuf->st_size = lte->resource_entry.original_size;
-       } else {
-               stbuf->st_nlink = 1;
-               stbuf->st_size = 0;
-       }
-       stbuf->st_uid     = getuid();
-       stbuf->st_gid     = getgid();
-       stbuf->st_atime   = ms_timestamp_to_unix(dentry->last_access_time);
-       stbuf->st_mtime   = ms_timestamp_to_unix(dentry->last_write_time);
-       stbuf->st_ctime   = ms_timestamp_to_unix(dentry->creation_time);
-       stbuf->st_blocks  = (stbuf->st_size + 511) / 512;
-}
 
 /* Makes all timestamp fields for the dentry be the current time. */
 void dentry_update_all_timestamps(struct dentry *dentry)
@@ -142,39 +103,66 @@ struct ads_entry *dentry_get_ads_entry(struct dentry *dentry,
        return NULL;
 }
 
+static void ads_entry_init(struct ads_entry *ads_entry)
+{
+       memset(ads_entry, 0, sizeof(struct ads_entry));
+       INIT_LIST_HEAD(&ads_entry->lte_group_list.list);
+       ads_entry->lte_group_list.type = STREAM_TYPE_ADS;
+}
+
 /* Add an alternate stream entry to a dentry and return a pointer to it, or NULL
  * on failure. */
 struct ads_entry *dentry_add_ads(struct dentry *dentry, const char *stream_name)
 {
-       u16 num_ads = dentry->num_ads + 1;
+       u16 num_ads;
        struct ads_entry *ads_entries;
        struct ads_entry *new_entry;
-       if (num_ads == 0xffff)
+
+       if (dentry->num_ads == 0xffff)
                return NULL;
-       ads_entries = MALLOC(num_ads * sizeof(struct ads_entry));
+       num_ads = dentry->num_ads + 1;
+       ads_entries = REALLOC(dentry->ads_entries,
+                             num_ads * sizeof(struct ads_entry));
        if (!ads_entries)
                return NULL;
+       if (ads_entries != dentry->ads_entries) {
+               /* We moved the ADS entries.  Adjust the stream lists. */
+               for (u16 i = 0; i < dentry->num_ads; i++) {
+                       struct list_head *cur = &ads_entries[i].lte_group_list.list;
+                       cur->prev->next = cur;
+                       cur->next->prev = cur;
+               }
+       }
+       dentry->ads_entries = ads_entries;
 
        new_entry = &ads_entries[num_ads - 1];
-       if (change_ads_name(new_entry, stream_name) != 0) {
-               FREE(ads_entries);
+       if (change_ads_name(new_entry, stream_name) != 0)
                return NULL;
-       }
-
-       memcpy(ads_entries, dentry->ads_entries,
-              (num_ads - 1) * sizeof(struct ads_entry));
-       FREE(dentry->ads_entries);
-       dentry->ads_entries = ads_entries;
        dentry->num_ads = num_ads;
-       return memset(new_entry, 0, sizeof(struct ads_entry));
+       ads_entry_init(new_entry);
+       return new_entry;
 }
 
-void dentry_remove_ads(struct dentry *dentry, struct ads_entry *sentry)
+void dentry_remove_ads(struct dentry *dentry, struct ads_entry *ads_entry)
 {
-       destroy_ads_entry(sentry);
-       memcpy(sentry, sentry + 1,
-              (dentry->num_ads - (sentry - dentry->ads_entries))
-                * sizeof(struct ads_entry));
+       u16 idx;
+       u16 following;
+
+       wimlib_assert(dentry->num_ads);
+       idx = ads_entry - dentry->ads_entries;
+       wimlib_assert(idx < dentry->num_ads);
+       following = dentry->num_ads - idx - 1;
+
+       destroy_ads_entry(ads_entry);
+       memcpy(ads_entry, ads_entry + 1, following * sizeof(struct ads_entry));
+
+       /* We moved the ADS entries.  Adjust the stream lists. */
+       for (u16 i = 0; i < following; i++) {
+               struct list_head *cur = &ads_entry[i].lte_group_list.list;
+               cur->prev->next = cur;
+               cur->next->prev = cur;
+       }
+
        dentry->num_ads--;
 }
 
@@ -486,6 +474,8 @@ static inline void dentry_common_init(struct dentry *dentry)
        memset(dentry, 0, sizeof(struct dentry));
        dentry->refcnt = 1;
        dentry->security_id = -1;
+       dentry->ads_entries_status = ADS_ENTRIES_DEFAULT;
+       dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
 }
 
 /* 
@@ -510,6 +500,7 @@ struct dentry *new_dentry(const char *name)
        dentry->next   = dentry;
        dentry->prev   = dentry;
        dentry->parent = dentry;
+       INIT_LIST_HEAD(&dentry->link_group_list);
        return dentry;
 err:
        FREE(dentry);
@@ -517,7 +508,7 @@ err:
        return NULL;
 }
 
-static void dentry_free_ads_entries(struct dentry *dentry)
+void dentry_free_ads_entries(struct dentry *dentry)
 {
        for (u16 i = 0; i < dentry->num_ads; i++)
                destroy_ads_entry(&dentry->ads_entries[i]);
@@ -526,37 +517,85 @@ static void dentry_free_ads_entries(struct dentry *dentry)
        dentry->num_ads = 0;
 }
 
-
-void free_dentry(struct dentry *dentry)
+static void __destroy_dentry(struct dentry *dentry)
 {
        FREE(dentry->file_name);
        FREE(dentry->file_name_utf8);
        FREE(dentry->short_name);
        FREE(dentry->full_path_utf8);
-       dentry_free_ads_entries(dentry);
+       FREE(dentry->extracted_file);
+}
+
+void free_dentry(struct dentry *dentry)
+{
+       wimlib_assert(dentry);
+       __destroy_dentry(dentry);
+       if (dentry->ads_entries_status != ADS_ENTRIES_USER)
+               dentry_free_ads_entries(dentry);
        FREE(dentry);
 }
 
-/* Arguments for do_free_dentry(). */
-struct free_dentry_args {
-       struct lookup_table *lookup_table;
-       bool lt_decrement_refcnt;
-};
+/* Like free_dentry(), but assigns a new ADS entries owner if this dentry was
+ * the previous owner, and also deletes the dentry from its link_group_list */
+void put_dentry(struct dentry *dentry)
+{
+       if (dentry->ads_entries_status == ADS_ENTRIES_OWNER) {
+               struct dentry *new_owner;
+               list_for_each_entry(new_owner, &dentry->link_group_list,
+                                   link_group_list)
+               {
+                       if (new_owner->ads_entries_status == ADS_ENTRIES_USER) {
+                               new_owner->ads_entries_status = ADS_ENTRIES_OWNER;
+                               break;
+                       }
+               }
+               dentry->ads_entries_status = ADS_ENTRIES_USER;
+       }
+       struct list_head *next;
+       list_del(&dentry->link_group_list);
+       free_dentry(dentry);
+}
+
+
+/* clones a dentry.
+ *
+ * Beware:
+ *     - memory for file names is not cloned
+ *     - next, prev, and children pointers and not touched
+ *     - stream entries are not cloned.
+ */
+struct dentry *clone_dentry(struct dentry *old)
+{
+       struct dentry *new = MALLOC(sizeof(struct dentry));
+       if (!new)
+               return NULL;
+       memcpy(new, old, sizeof(struct dentry));
+       new->file_name          = NULL;
+       new->file_name_len      = 0;
+       new->file_name_utf8     = NULL;
+       new->file_name_utf8_len = 0;
+       new->short_name         = NULL;
+       new->short_name_len     = 0;
+       return new;
+}
 
 /* 
  * This function is passed as an argument to for_dentry_in_tree_depth() in order
  * to free a directory tree.  __args is a pointer to a `struct free_dentry_args'.
  */
-static int do_free_dentry(struct dentry *dentry, void *__args)
+static int do_free_dentry(struct dentry *dentry, void *__lookup_table)
 {
-       struct free_dentry_args *args = (struct free_dentry_args*)__args;
-
-       if (args->lt_decrement_refcnt && !dentry_is_directory(dentry)) {
-               lookup_table_decrement_refcnt(args->lookup_table, 
-                                             dentry->hash);
+       struct lookup_table *lookup_table = __lookup_table;
+       if (lookup_table) {
+               struct lookup_table_entry *lte;
+               if (dentry->resolved)
+                       lte = dentry->lte;
+               else
+                       lte = __lookup_resource(lookup_table, dentry->hash);
+               lte_decrement_refcnt(lte, lookup_table);
        }
 
-       wimlib_assert(dentry->refcnt >= 1);
+       wimlib_assert(dentry->refcnt != 0);
        if (--dentry->refcnt == 0)
                free_dentry(dentry);
        return 0;
@@ -566,20 +605,16 @@ static int do_free_dentry(struct dentry *dentry, void *__args)
  * Unlinks and frees a dentry tree.
  *
  * @root:              The root of the tree.
- * @lookup_table:      The lookup table for dentries.
- * @decrement_refcnt:          True if the dentries in the tree are to have their 
- *                     reference counts in the lookup table decremented.
+ * @lookup_table:      The lookup table for dentries.  If non-NULL, the
+ *                     reference counts in the lookup table for the lookup
+ *                     table entries corresponding to the dentries will be
+ *                     decremented.
  */
-void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table, 
-                     bool lt_decrement_refcnt)
+void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table)
 {
        if (!root || !root->parent)
                return;
-
-       struct free_dentry_args args;
-       args.lookup_table        = lookup_table;
-       args.lt_decrement_refcnt = lt_decrement_refcnt;
-       for_dentry_in_tree_depth(root, do_free_dentry, &args);
+       for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
 }
 
 int increment_dentry_refcnt(struct dentry *dentry, void *ignore)
@@ -596,6 +631,7 @@ int increment_dentry_refcnt(struct dentry *dentry, void *ignore)
  */
 void link_dentry(struct dentry *dentry, struct dentry *parent)
 {
+       wimlib_assert(dentry_is_directory(parent));
        dentry->parent = parent;
        if (parent->children) {
                /* Not an only child; link to siblings. */
@@ -611,7 +647,13 @@ void link_dentry(struct dentry *dentry, struct dentry *parent)
        }
 }
 
-/* Unlink a dentry from the directory tree. */
+
+/* Unlink a dentry from the directory tree. 
+ *
+ * Note: This merely removes it from the in-memory tree structure.  See
+ * remove_dentry() in mount.c for a function implemented on top of this one that
+ * frees the dentry and implements reference counting for the lookup table
+ * entries. */
 void unlink_dentry(struct dentry *dentry)
 {
        if (dentry_is_root(dentry))
@@ -637,36 +679,35 @@ static inline void recalculate_dentry_size(struct dentry *dentry)
        dentry->length = (dentry->length + 7) & ~7;
 }
 
-static int do_name_change(char **file_name_ret,
-                         char **file_name_utf8_ret,
-                         u16 *file_name_len_ret,
-                         u16 *file_name_utf8_len_ret,
-                         const char *new_name)
+/* Duplicates a UTF-8 name into UTF-8 and UTF-16 strings and returns the strings
+ * and their lengths in the pointer arguments */
+int get_names(char **name_utf16_ret, char **name_utf8_ret,
+             u16 *name_utf16_len_ret, u16 *name_utf8_len_ret,
+             const char *name)
 {
        size_t utf8_len;
        size_t utf16_len;
-       char *file_name, *file_name_utf8;
+       char *name_utf16, *name_utf8;
 
-       utf8_len = strlen(new_name);
+       utf8_len = strlen(name);
 
-       file_name = utf8_to_utf16(new_name, utf8_len, &utf16_len);
+       name_utf16 = utf8_to_utf16(name, utf8_len, &utf16_len);
 
-       if (!file_name)
+       if (!name_utf16)
                return WIMLIB_ERR_NOMEM;
 
-       file_name_utf8 = MALLOC(utf8_len + 1);
-       if (!file_name_utf8) {
-               FREE(file_name);
+       name_utf8 = MALLOC(utf8_len + 1);
+       if (!name_utf8) {
+               FREE(name_utf8);
                return WIMLIB_ERR_NOMEM;
        }
-       memcpy(file_name_utf8, new_name, utf8_len + 1);
-
-       FREE(*file_name_ret);
-       FREE(*file_name_utf8_ret);
-       *file_name_ret          = file_name;
-       *file_name_utf8_ret     = file_name_utf8;
-       *file_name_len_ret      = utf16_len;
-       *file_name_utf8_len_ret = utf8_len;
+       memcpy(name_utf8, name, utf8_len + 1);
+       FREE(*name_utf8_ret);
+       FREE(*name_utf16_ret);
+       *name_utf8_ret      = name_utf8;
+       *name_utf16_ret     = name_utf16;
+       *name_utf8_len_ret  = utf8_len;
+       *name_utf16_len_ret = utf16_len;
        return 0;
 }
 
@@ -677,9 +718,9 @@ int change_dentry_name(struct dentry *dentry, const char *new_name)
 {
        int ret;
 
-       ret = do_name_change(&dentry->file_name, &dentry->file_name_utf8,
-                            &dentry->file_name_len, &dentry->file_name_utf8_len,
-                            new_name);
+       ret = get_names(&dentry->file_name, &dentry->file_name_utf8,
+                       &dentry->file_name_len, &dentry->file_name_utf8_len,
+                        new_name);
        if (ret == 0)
                recalculate_dentry_size(dentry);
        return ret;
@@ -687,10 +728,10 @@ int change_dentry_name(struct dentry *dentry, const char *new_name)
 
 int change_ads_name(struct ads_entry *entry, const char *new_name)
 {
-       return do_name_change(&entry->stream_name, &entry->stream_name_utf8,
-                             &entry->stream_name_len,
-                             &entry->stream_name_utf8_len,
-                             new_name);
+       return get_names(&entry->stream_name, &entry->stream_name_utf8,
+                        &entry->stream_name_len,
+                        &entry->stream_name_utf8_len,
+                         new_name);
 }
 
 /* Parameters for calculate_dentry_statistics(). */
@@ -715,7 +756,10 @@ static int calculate_dentry_statistics(struct dentry *dentry, void *arg)
        else
                ++*stats->file_count;
 
-       lte = __lookup_resource(stats->lookup_table, dentry->hash);
+       if (dentry->resolved)
+               lte = dentry->lte;
+       else
+               lte = __lookup_resource(stats->lookup_table, dentry->hash);
        i = 0;
        while (1) {
                if (lte) {
@@ -912,13 +956,9 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
         */
        if (dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
                /* ??? */
-               u32 u1, u2;
-               p = get_u32(p, &u1);
-               /*p += 4;*/
+               p += 4;
                p = get_u32(p, &dentry->reparse_tag);
-               p = get_u32(p, &u2);
-               /*p += 4;*/
-               dentry->hard_link = (u64)(u1) | ((u64)(u2) << 32);
+               p += 4;
        } else {
                p = get_u32(p, &dentry->reparse_tag);
                p = get_u64(p, &dentry->hard_link);
@@ -1056,7 +1096,8 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
 {
        u8 *orig_p = p;
        unsigned padding;
-       memset(p, 0, dentry->length);
+       const u8 *hash;
+
        p = put_u64(p, dentry->length);
        p = put_u32(p, dentry->attributes);
        p = put_u32(p, dentry->security_id);
@@ -1066,11 +1107,25 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
        p = put_u64(p, dentry->creation_time);
        p = put_u64(p, dentry->last_access_time);
        p = put_u64(p, dentry->last_write_time);
-       memcpy(p, dentry->hash, WIM_HASH_SIZE);
-       p += WIM_HASH_SIZE;
-       p = put_u32(p, dentry->reparse_tag);
-       p = put_u64(p, dentry->hard_link);
-       p = put_u16(p, dentry->num_ads); /*streams */
+       if (dentry->resolved && dentry->lte)
+               hash = dentry->lte->hash;
+       else
+               hash = dentry->hash;
+       p = put_bytes(p, WIM_HASH_SIZE, hash);
+       if (dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+               p = put_zeroes(p, 4);
+               p = put_u32(p, dentry->reparse_tag);
+               p = put_zeroes(p, 4);
+       } else {
+               u64 hard_link;
+               p = put_u32(p, dentry->reparse_tag);
+               if (dentry->link_group_list.next == &dentry->link_group_list)
+                       hard_link = 0;
+               else
+                       hard_link = dentry->hard_link;
+               p = put_u64(p, hard_link);
+       }
+       p = put_u16(p, dentry->num_ads);
        p = put_u16(p, dentry->short_name_len);
        p = put_u16(p, dentry->file_name_len);
        p = put_bytes(p, dentry->file_name_len, (u8*)dentry->file_name);
@@ -1108,8 +1163,8 @@ u8 *write_dentry_tree(const struct dentry *tree, u8 *p)
                /* write end of directory entry */
                p = put_u64(p, 0);
        } else {
-               /* Nothing to do for a regular file. */
-               if (dentry_is_regular_file(tree))
+               /* Nothing to do for non-directories */
+               if (!dentry_is_directory(tree))
                        return p;
        }
 
@@ -1221,17 +1276,3 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
        dentry->children = first_child;
        return ret;
 }
-
-int dentry_set_symlink_buf(struct dentry *dentry, const u8 symlink_buf_hash[])
-{
-       struct ads_entry *ads_entries;
-
-       ads_entries = CALLOC(2, sizeof(struct ads_entry));
-       if (!ads_entries)
-               return WIMLIB_ERR_NOMEM;
-       memcpy(ads_entries[1].hash, symlink_buf_hash, WIM_HASH_SIZE);
-       dentry_free_ads_entries(dentry);
-       dentry->num_ads = 2;
-       dentry->ads_entries = ads_entries;
-       return 0;
-}