#include "config.h"
#include "list.h"
#include "sha1.h"
+#include "rbtree.h"
#include <string.h>
struct stat;
* including the stream length field (see below). */
#define WIM_ADS_ENTRY_DISK_SIZE 38
-
-/*
- * Reparse tags documented at
+/*
+ * Reparse tags documented at
* http://msdn.microsoft.com/en-us/library/dd541667(v=prot.10).aspx
*/
#define WIM_IO_REPARSE_TAG_RESERVED_ZERO 0x00000000
char *stream_name_utf8;
#ifdef WITH_FUSE
+ /* Number to identify an alternate data stream even after it's possibly
+ * been moved or renamed. */
u32 stream_id;
#endif
};
-/* Returns the total length of a WIM alternate data stream entry on-disk,
- * including the stream name, the null terminator, AND the padding after the
- * entry to align the next one (or the next dentry) on an 8-byte boundary. */
-static inline u64 ads_entry_total_length(const struct ads_entry *entry)
-{
- u64 len = WIM_ADS_ENTRY_DISK_SIZE;
- if (entry->stream_name_len)
- len += entry->stream_name_len + 2;
- return (len + 7) & ~7;
-}
-
-static inline 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;
-}
static inline bool ads_entries_have_same_name(const struct ads_entry *entry_1,
const struct ads_entry *entry_2)
entry_1->stream_name_len) == 0;
}
-/*
+/*
* In-memory structure for a WIM directory entry (dentry). There is a directory
- * tree for each image in the WIM.
+ * 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 a NTFS inode to correspond to multiple WIM dentries.
*/
struct dentry {
/* The inode for this dentry */
- struct inode *inode;
+ struct inode *d_inode;
/* The parent of this directory entry. */
struct dentry *parent;
- /* Linked list of sibling directory entries. */
- struct dentry *next;
- struct dentry *prev;
+ struct rb_node rb_node;
- /*
+ /*
* Size of directory entry on disk, in bytes. Typical size is around
* 104 to 120 bytes.
*
};
};
+#define rbnode_dentry(node) container_of(node, struct dentry, rb_node)
+
/*
* WIM inode.
*
int32_t security_id;
/* %true iff the inode's lookup table entries has been resolved (i.e.
- * the @lte field is valid, but the @hash field is not valid)
+ * the @lte field is valid, but the @hash field is not valid)
*
* (This is not an on-disk field.) */
u8 resolved : 1;
struct hlist_node hlist;
char *extracted_file;
- /* If non-NULL, the children of this inode (implies the inode is a
- * directory) */
- struct dentry *children;
+ /* Root of a red-black tree storing the children of this inode (if
+ * non-empty, implies the inode is a directory, although that is also
+ * noted in the @attributes field.) */
+ struct rb_root children;
#ifdef WITH_FUSE
/* wimfs file descriptors table for the inode */
return dentry->is_extracted;
}
-extern struct ads_entry *inode_get_ads_entry(struct inode *inode,
- const char *stream_name,
- u16 *idx_ret);
-
-extern struct ads_entry *inode_add_ads(struct inode *dentry,
- const char *stream_name);
-
-extern void inode_remove_ads(struct inode *inode, u16 idx,
- struct lookup_table *lookup_table);
-
-extern const char *path_stream_name(const char *path);
+static inline bool dentry_is_first_in_inode(const struct dentry *dentry)
+{
+ return container_of(dentry->d_inode->dentry_list.next,
+ struct dentry,
+ inode_dentry_list) == dentry;
+}
-extern u64 dentry_total_length(const struct dentry *dentry);
extern u64 dentry_correct_total_length(const struct dentry *dentry);
extern void stbuf_to_inode(const struct stat *stbuf, struct inode *inode);
extern int inode_to_stbuf(const struct inode *inode,
struct lookup_table_entry *lte, struct stat *stbuf);
-extern int for_dentry_in_tree(struct dentry *root,
- int (*visitor)(struct dentry*, void*),
+extern int for_dentry_in_tree(struct dentry *root,
+ int (*visitor)(struct dentry*, void*),
void *args);
-extern int for_dentry_in_tree_depth(struct dentry *root,
- int (*visitor)(struct dentry*, void*),
+extern int for_dentry_in_rbtree(struct rb_node *node,
+ int (*visitor)(struct dentry *, void *),
+ void *arg);
+
+extern int for_dentry_in_tree_depth(struct dentry *root,
+ int (*visitor)(struct dentry*, void*),
void *args);
extern int calculate_dentry_full_path(struct dentry *dentry, void *ignore);
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);
-
-extern void unlink_dentry(struct dentry *dentry);
-extern void link_dentry(struct dentry *dentry, struct dentry *parent);
-
-extern int print_dentry(struct dentry *dentry, void *lookup_table);
-extern int print_dentry_full_path(struct dentry *entry, void *ignore);
extern struct dentry *get_dentry(struct WIMStruct *w, const char *path);
extern struct inode *wim_pathname_to_inode(struct WIMStruct *w,
const char *path);
+extern struct dentry *get_dentry_child_with_name(const struct dentry *dentry,
+ const char *name);
extern struct dentry *get_parent_dentry(struct WIMStruct *w, const char *path);
-extern struct dentry *get_dentry_child_with_name(const struct dentry *dentry,
- const char *name);
-extern void dentry_update_all_timestamps(struct dentry *dentry);
-extern void init_dentry(struct dentry *dentry, const char *name);
+
+extern int print_dentry(struct dentry *dentry, void *lookup_table);
+extern int print_dentry_full_path(struct dentry *entry, void *ignore);
+
extern struct dentry *new_dentry(const char *name);
-extern struct inode *new_inode();
-extern struct inode *new_timeless_inode();
extern struct dentry *new_dentry_with_inode(const char *name);
extern struct dentry *new_dentry_with_timeless_inode(const char *name);
-extern void inode_free_ads_entries(struct inode *inode);
-extern struct inode *free_dentry(struct dentry *dentry);
extern void free_inode(struct inode *inode);
-extern struct inode *put_inode(struct inode *inode);
-extern struct dentry *clone_dentry(struct dentry *old);
+extern void free_dentry(struct dentry *dentry);
extern void put_dentry(struct dentry *dentry);
+
extern void free_dentry_tree(struct dentry *root,
struct lookup_table *lookup_table);
extern int increment_dentry_refcnt(struct dentry *dentry, void *ignore);
-extern int decrement_dentry_refcnt(struct dentry *dentry, void *ignore);
-extern void calculate_dir_tree_statistics(struct dentry *root,
- struct lookup_table *table,
- u64 *dir_count_ret,
- u64 *file_count_ret,
- u64 *total_bytes_ret,
- u64 *hard_link_bytes_ret);
+extern void unlink_dentry(struct dentry *dentry);
+extern bool dentry_add_child(struct dentry * restrict parent,
+ struct dentry * restrict child);
-extern int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
- u64 offset, struct dentry *dentry);
+// XXX
+#define link_dentry(child, parent) dentry_add_child(parent, child)
extern int verify_dentry(struct dentry *dentry, void *wim);
-extern int read_dentry_tree(const u8 metadata_resource[],
- u64 metadata_resource_len, struct dentry *dentry);
-extern u8 *write_dentry_tree(const struct dentry *tree, u8 *p);
+extern struct ads_entry *inode_get_ads_entry(struct inode *inode,
+ const char *stream_name,
+ u16 *idx_ret);
+extern struct ads_entry *inode_add_ads(struct inode *dentry,
+ const char *stream_name);
+extern void inode_remove_ads(struct inode *inode, u16 idx,
+ struct lookup_table *lookup_table);
-static inline struct dentry *inode_first_dentry(struct inode *inode)
-{
- wimlib_assert(inode->dentry_list.next != &inode->dentry_list);
- return container_of(inode->dentry_list.next, struct dentry,
- inode_dentry_list);
-}
+extern int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
+ u64 offset, struct dentry *dentry);
-static inline bool dentry_is_root(const struct dentry *dentry)
-{
- return dentry->parent == dentry;
-}
-static inline bool dentry_is_first_sibling(const struct dentry *dentry)
-{
- return dentry_is_root(dentry) || dentry->parent->inode->children == dentry;
-}
+extern int read_dentry_tree(const u8 metadata_resource[],
+ u64 metadata_resource_len, struct dentry *dentry);
-static inline bool dentry_is_only_child(const struct dentry *dentry)
+extern u8 *write_dentry_tree(const struct dentry *tree, u8 *p);
+
+static inline bool dentry_is_root(const struct dentry *dentry)
{
- return dentry->next == dentry;
+ return dentry->parent == dentry;
}
static inline bool inode_is_directory(const struct inode *inode)
static inline bool dentry_is_directory(const struct dentry *dentry)
{
- return inode_is_directory(dentry->inode);
+ return inode_is_directory(dentry->d_inode);
}
/* For our purposes, we consider "real" symlinks and "junction points" to both
static inline bool dentry_is_symlink(const struct dentry *dentry)
{
- return inode_is_symlink(dentry->inode);
+ return inode_is_symlink(dentry->d_inode);
}
static inline bool inode_is_regular_file(const struct inode *inode)
static inline bool dentry_is_regular_file(const struct dentry *dentry)
{
- return inode_is_regular_file(dentry->inode);
+ return inode_is_regular_file(dentry->d_inode);
+}
+
+static inline bool inode_has_children(const struct inode *inode)
+{
+ return inode->children.rb_node != NULL;
}
static inline bool dentry_is_empty_directory(const struct dentry *dentry)
{
- return dentry_is_directory(dentry) && dentry->inode->children == NULL;
+ const struct inode *inode = dentry->d_inode;
+ return inode_is_directory(inode) && !inode_has_children(inode);
}
#endif
git://wimlib.net / wimlib / blobdiff