Fix sequential extraction, and include progress info

[wimlib] / src / dentry.c

diff --git a/src/dentry.c b/src/dentry.c
index 559d7e8ba71c5fca359c750a5cf94f86a0db3fb7..0e8d81f40cb798b6a05ce5866b0f1714f4008424 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -71,16 +71,6 @@ static u64 dentry_correct_length(const struct dentry *dentry)
        return (dentry_correct_length_unaligned(dentry) + 7) & ~7;
 }
 
-/* Return %true iff @dentry has the UTF-8 file name @name that has length
- * @name_len bytes. */
-static bool dentry_has_name(const struct dentry *dentry, const char *name,
-                           size_t name_len)
-{
-       if (dentry->file_name_utf8_len != name_len)
-               return false;
-       return memcmp(dentry->file_name_utf8, name, name_len) == 0;
-}
-
 /* Return %true iff the alternate data stream entry @entry has the UTF-8 stream
  * name @name that has length @name_len bytes. */
 static inline bool ads_entry_has_name(const struct ads_entry *entry,
@@ -185,28 +175,6 @@ static u64 dentry_total_length(const struct dentry *dentry)
        return __dentry_total_length(dentry, dentry->length);
 }
 
-/* Transfers file attributes from a `stat' buffer to a WIM "inode". */
-void stbuf_to_inode(const struct stat *stbuf, struct inode *inode)
-{
-       if (S_ISLNK(stbuf->st_mode)) {
-               inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
-               inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
-       } else if (S_ISDIR(stbuf->st_mode)) {
-               inode->attributes = FILE_ATTRIBUTE_DIRECTORY;
-       } else {
-               inode->attributes = FILE_ATTRIBUTE_NORMAL;
-       }
-       if (sizeof(ino_t) >= 8)
-               inode->ino = (u64)stbuf->st_ino;
-       else
-               inode->ino = (u64)stbuf->st_ino |
-                                  ((u64)stbuf->st_dev << ((sizeof(ino_t) * 8) & 63));
-       /* Set timestamps */
-       inode->creation_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
-       inode->last_write_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
-       inode->last_access_time = timespec_to_wim_timestamp(&stbuf->st_atim);
-}
-
 #ifdef WITH_FUSE
 /* Transfers file attributes from a struct inode to a `stat' buffer.
  *
@@ -1069,9 +1037,8 @@ static int do_free_dentry(struct dentry *dentry, void *__lookup_table)
  */
 void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table)
 {
-       if (!root || !root->parent)
-               return;
-       for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
+       if (root)
+               for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
 }
 
 int increment_dentry_refcnt(struct dentry *dentry, void *ignore)
@@ -1851,9 +1818,7 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
                        break;
                }
                memcpy(child, &cur_child, sizeof(struct dentry));
-
                dentry_add_child(dentry, child);
-
                inode_add_dentry(child, child->d_inode);
 
                /* If there are children of this child, call this procedure