#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
};
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.
* hardlink.c).
*/
struct dentry {
+ /* Byte 0 */
+
/* The inode for this dentry */
struct inode *d_inode;
+ /* Byte 8 */
+
+ /* Red-black tree of sibling dentries */
+ struct rb_node rb_node;
+
+ /* Byte 32 */
+
+ /* Length of short filename, in bytes, not including the terminating
+ * zero wide-character. */
+ u16 short_name_len;
+
+ /* Length of file name, in bytes, not including the terminating zero
+ * wide-character. */
+ u16 file_name_len;
+
+ /* Length of the filename converted into UTF-8, in bytes, not including
+ * the terminating zero byte. */
+ u16 file_name_utf8_len;
+
+ u8 is_extracted : 1;
+
+ /* Byte 40 */
+
+ /* Pointer to the filename converted to UTF-8 (malloc()ed buffer). */
+ char *file_name_utf8;
+
+ /* Byte 48 */
+
+ union {
+ struct list_head tmp_list;
+ struct {
+ void *tmp_ptr_1;
+ void *tmp_ptr_2;
+ };
+ };
+
+ /* Byte 64 */
+
+ /* List of dentries in the inode (hard link set) */
+ struct list_head inode_dentry_list;
+
/* The parent of this directory entry. */
struct dentry *parent;
- /* Linked list of sibling directory entries. */
- struct dentry *next;
- struct dentry *prev;
-
- /*
+ /*
* Size of directory entry on disk, in bytes. Typical size is around
* 104 to 120 bytes.
*
*/
u64 length;
+
/* The offset, from the start of the uncompressed WIM metadata resource
* for this image, of this dentry's child dentries. 0 if the directory
* entry has no children, which is the case for regular files or reparse
* points. */
u64 subdir_offset;
- /* Length of short filename, in bytes, not including the terminating
- * zero wide-character. */
- u16 short_name_len;
-
- /* Length of file name, in bytes, not including the terminating zero
- * wide-character. */
- u16 file_name_len;
-
- /* Length of the filename converted into UTF-8, in bytes, not including
- * the terminating zero byte. */
- u16 file_name_utf8_len;
+ /* Number of references to the dentry tree itself, as in multiple
+ * WIMStructs */
+ u32 refcnt;
- /* Pointer to the short filename (malloc()ed buffer) */
+ /* Pointer to the UTF-16 short filename (malloc()ed buffer) */
char *short_name;
- /* Pointer to the filename (malloc()ed buffer). */
+ /* Pointer to the UTF-16 filename (malloc()ed buffer). */
char *file_name;
- /* Pointer to the filename converted to UTF-8 (malloc()ed buffer). */
- char *file_name_utf8;
-
- /* Full path to this dentry (malloc()ed buffer). */
+ /* Full path (UTF-8) to this dentry (malloc()ed buffer). */
char *full_path_utf8;
u32 full_path_utf8_len;
-
- /* Number of references to the dentry tree itself, as in multiple
- * WIMStructs */
- u32 refcnt;
-
- /* List of dentries in the inode (hard link set) */
- struct list_head inode_dentry_list;
-
- union {
- struct list_head tmp_list;
- bool is_extracted;
- };
};
+#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;
}
+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_correct_total_length(const struct dentry *dentry);
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 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,
+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 int increment_dentry_refcnt(struct dentry *dentry, void *ignore);
extern void unlink_dentry(struct dentry *dentry);
-extern void link_dentry(struct dentry *dentry, struct dentry *parent);
-
-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 bool dentry_add_child(struct dentry * restrict parent,
+ struct dentry * restrict child);
extern int verify_dentry(struct dentry *dentry, void *wim);
extern void inode_remove_ads(struct inode *inode, u16 idx,
struct lookup_table *lookup_table);
-extern int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
+extern int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
u64 offset, struct dentry *dentry);
-extern int read_dentry_tree(const u8 metadata_resource[],
+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);
return dentry->parent == dentry;
}
-static inline bool dentry_is_first_sibling(const struct dentry *dentry)
-{
- return dentry_is_root(dentry) || dentry->parent->d_inode->children == dentry;
-}
-
-static inline bool dentry_is_only_child(const struct dentry *dentry)
-{
- return dentry->next == dentry;
-}
-
static inline bool inode_is_directory(const struct inode *inode)
{
return (inode->attributes & FILE_ATTRIBUTE_DIRECTORY)
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->d_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