struct lookup_table_entry *lte;
};
- /* Length of stream name (UTF-16) */
+ /* Length of stream name (UTF-16). This is in bytes, not characters,
+ * and does not include the terminating null character */
u16 stream_name_len;
/* Length of stream name (UTF-8) */
/* Stream name (UTF-8) */
char *stream_name_utf8;
- /* Doubly linked list of streams that share the same lookup table entry */
- struct stream_list_head lte_group_list;
-
- /* Containing inode */
- struct inode *inode;
+#ifdef WITH_FUSE
+ u32 stream_id;
+#endif
};
/* Returns the total length of a WIM alternate data stream entry on-disk,
entry_1->stream_name_len) == 0;
}
+struct wimlib_fd;
+
struct inode {
/* Timestamps for the inode. The timestamps are the number of
* 100-nanosecond intervals that have elapsed since 12:00 A.M., January
* the @lte field is valid, but the @hash field is not valid)
*
* (This is not an on-disk field.) */
- bool resolved;
+ u8 resolved : 1;
+
+ u8 verified : 1;
u16 num_ads;
struct ads_entry **ads_entries;
+ /* 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.
+ *
+ * Unfortunately, in some WIMs it is NOT the case that all dentries that
+ * share this field are actually in the same hard link set, although the
+ * WIMs that wimlib writes maintain this restriction. */
u64 ino;
struct list_head dentry_list;
- union {
- struct stream_list_head lte_group_list;
- struct hlist_node hlist;
- };
+ struct hlist_node hlist;
char *extracted_file;
+
+ struct dentry *children;
+
+#ifdef WITH_FUSE
+ u16 num_opened_fds;
+ u16 num_allocated_fds;
+ struct wimlib_fd **fds;
+ u32 next_stream_id;
+#endif
};
+#define inode_for_each_dentry(dentry, inode) \
+ list_for_each_entry((dentry), &(inode)->dentry_list, inode_dentry_list)
+
+#define inode_add_dentry(dentry, inode) \
+ list_add(&(dentry)->inode_dentry_list, &(inode)->dentry_list)
+
/*
* In-memory structure for a WIM directory entry (dentry). There is a directory
* tree for each image in the WIM.
* conflicting fields to split up the hard link groups.
*/
struct dentry {
+ /* The inode for this dentry */
+ struct inode *inode;
+
/* The parent of this directory entry. */
struct dentry *parent;
struct dentry *next;
struct dentry *prev;
- /* Pointer to a child of this directory entry. */
- struct dentry *children;
-
- struct inode *inode;
-
/*
* Size of directory entry on disk, in bytes. Typical size is around
* 104 to 120 bytes.
* read_dentry() function. */
//u32 reparse_reserved;
- /* 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.
- *
- * Unfortunately, in some WIMs it is NOT the case that all dentries that
- * share this field are actually in the same hard link set, although the
- * WIMs that wimlib writes maintain this restriction. */
- u64 link_group_id;
/* Length of short filename, in bytes, not including the terminating
* zero wide-character. */
char *full_path_utf8;
u32 full_path_utf8_len;
- union {
- /* Number of references to the dentry tree itself, as in multiple
- * WIMStructs */
- u32 refcnt;
-
- /* Number of times this dentry has been opened (only for
- * directories!) */
- u32 num_times_opened;
- };
+ /* Number of references to the dentry tree itself, as in multiple
+ * WIMStructs */
+ u32 refcnt;
/* List of dentries in the hard link set */
struct list_head inode_dentry_list;
- struct list_head tmp_list;
+ union {
+ struct list_head tmp_list;
+ bool is_extracted;
+ };
};
+static inline bool dentry_is_extracted(const struct dentry *dentry)
+{
+ return dentry->is_extracted;
+}
-extern struct ads_entry *dentry_get_ads_entry(struct dentry *dentry,
- const char *stream_name);
-extern struct ads_entry *dentry_add_ads(struct dentry *dentry,
- const char *stream_name);
+extern struct ads_entry *inode_get_ads_entry(struct inode *inode,
+ const char *stream_name,
+ u16 *idx_ret);
-extern void dentry_remove_ads(struct dentry *dentry, struct ads_entry *entry);
+extern struct ads_entry *inode_add_ads(struct inode *dentry,
+ const char *stream_name);
extern const char *path_stream_name(const char *path);
extern u64 dentry_total_length(const struct dentry *dentry);
extern u64 dentry_correct_total_length(const struct dentry *dentry);
-extern void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry);
+extern void stbuf_to_inode(const struct stat *stbuf, struct inode *inode);
extern int for_dentry_in_tree(struct dentry *root,
int (*visitor)(struct dentry*, void*),
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_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 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 void dentry_free_ads_entries(struct dentry *dentry);
-extern void free_dentry(struct dentry *dentry);
+extern void free_ads_entry(struct ads_entry *entry);
+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 void put_inode(struct inode *inode);
-extern void put_dentry(struct dentry *dentry);
+extern struct inode *put_inode(struct inode *inode);
extern struct dentry *clone_dentry(struct dentry *old);
+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 u8 *write_dentry_tree(const struct dentry *tree, u8 *p);
-/* Return the number of dentries in the hard link group */
-static inline size_t dentry_link_group_size(const struct dentry *dentry)
+static inline struct dentry *inode_first_dentry(struct inode *inode)
{
- const struct list_head *cur;
- size_t size = 0;
- list_for_each(cur, &dentry->inode_dentry_list)
- size++;
- return size;
+ wimlib_assert(inode->dentry_list.next != &inode->dentry_list);
+ return container_of(inode->dentry_list.next, struct dentry,
+ inode_dentry_list);
}
static inline bool dentry_is_root(const struct dentry *dentry)
static inline bool dentry_is_first_sibling(const struct dentry *dentry)
{
- return dentry_is_root(dentry) || dentry->parent->children == dentry;
+ return dentry_is_root(dentry) || dentry->parent->inode->children == dentry;
}
static inline bool dentry_is_only_child(const struct dentry *dentry)
return inode_is_symlink(dentry->inode);
}
+static inline bool inode_is_regular_file(const struct inode *inode)
+{
+ return !inode_is_directory(inode) && !inode_is_symlink(inode);
+}
+
static inline bool dentry_is_regular_file(const struct dentry *dentry)
{
- return !dentry_is_directory(dentry) && !dentry_is_symlink(dentry);
+ return inode_is_regular_file(dentry->inode);
}
static inline bool dentry_is_empty_directory(const struct dentry *dentry)
{
- return dentry_is_directory(dentry) && dentry->children == NULL;
+ return dentry_is_directory(dentry) && dentry->inode->children == NULL;
}
#endif
git://wimlib.net / wimlib / blobdiff