* including the terminating null character. */
u32 full_path_nbytes;
- /* For extraction operations, a subtree of dentries will have this flag
- * set so we can keep track of which dentries still need to be
- * extracted. Otherwise this will always be 0. */
- u8 needs_extraction : 1;
-
/* For extraction operations, this flag will be set when a dentry in the
* tree being extracted is not being extracted for some reason (file
* type not supported by target filesystem or contains invalid
* characters). Otherwise this will always be 0. */
- u8 not_extracted : 1;
+ u8 extraction_skipped : 1;
+
+ /* For extraction operations, this flag will be set on dentries in the
+ * tree being extracted. */
+ u8 in_extraction_tree : 1;
+
+ /* During extraction extractions, this flag will be set after the
+ * "skeleton" of the dentry has been extracted. */
+ u8 skeleton_extracted : 1;
/* When capturing from a NTFS volume using NTFS-3g, this flag is set on
* dentries that were created from a filename in the WIN32 or WIN32+DOS
* names. */
u8 dos_name_invalid : 1;
+ u8 tmp_flag : 1;
+
+ u8 was_hardlinked : 1;
+
/* Temporary list field used to make lists of dentries in a few places.
* */
struct list_head tmp_list;
* alias file_name. */
tchar *extraction_name;
size_t extraction_name_nchars;
-
- /* (Extraction only) List head for building a list of dentries that
- * contain a certain stream. */
- struct list_head extraction_stream_list;
};
#define rbnode_dentry(node) container_of(node, struct wim_dentry, rb_node)
/* Number of dentries that are aliases for this inode. */
u32 i_nlink;
- /* Number of alternate data streams associated with this inode */
+ /* Number of alternate data streams (ADS) associated with this inode */
u16 i_num_ads;
/* Flag that indicates whether this inode's streams have been
* error paths. */
u8 i_visited : 1;
- /* For NTFS-3g extraction: Set after the DOS name for this inode has
- * been extracted. */
+ /* Set if the DOS name of an inode has already been extracted. */
u8 i_dos_name_extracted : 1;
+ /* 1 iff all ADS entries of this inode are named or if this inode
+ * has no ADS entries */
+ u8 i_canonical_streams : 1;
+
/* Pointer to a malloc()ed array of i_num_ads alternate data stream
* entries for this inode. */
struct wim_ads_entry *i_ads_entries;
* to 0 otherwise. */
u64 i_devno;
- /* Used only during image extraction: pointer to the first path
- * (malloc()ed buffer) at which this inode has been extracted.
- * Freed and set to NULL after the extraction is done (either
- * success or failure). */
- tchar *i_extracted_file;
+ struct {
+
+ /* Used only during image extraction: pointer to the first path
+ * (malloc()ed buffer) at which this inode has been extracted.
+ * Freed and set to NULL after the extraction is done (either
+ * success or failure). */
+ tchar *i_extracted_file;
+
+ /** Used only during image extraction: "cookie" that
+ * identifies this extracted file (inode), for example
+ * an inode number. Only used if supported by the
+ * extraction mode. */
+ u64 extract_cookie;
+ };
#ifdef WITH_FUSE
/* Used only during image mount: Table of file descriptors that
* have been opened to this inode. The table is automatically
* freed when the last file descriptor is closed. */
- struct {
- struct wimfs_fd **i_fds;
- u16 i_num_opened_fds;
- u16 i_num_allocated_fds;
- };
+ struct wimfs_fd **i_fds;
#endif
};
+#ifdef WITH_FUSE
+ u16 i_num_opened_fds;
+ u16 i_num_allocated_fds;
+#endif
+
/* Next alternate data stream ID to be assigned */
u32 i_next_stream_id;
};
}
extern u64
-dentry_correct_total_length(const struct wim_dentry *dentry);
+dentry_out_total_length(const struct wim_dentry *dentry);
extern int
for_dentry_in_tree(struct wim_dentry *root,
int (*visitor)(struct wim_dentry *, void *),
void *arg);
-static inline int
+extern int
for_dentry_child(const struct wim_dentry *dentry,
int (*visitor)(struct wim_dentry *, void *),
- void *arg)
-{
- return for_dentry_in_rbtree(dentry->d_inode->i_children.rb_node,
- visitor,
- arg);
-}
+ void *arg);
extern int
for_dentry_in_tree_depth(struct wim_dentry *root,
extern int
new_dentry_with_timeless_inode(const tchar *name, struct wim_dentry **dentry_ret);
+extern void
+dentry_tree_clear_inode_visited(struct wim_dentry *root);
+
extern int
new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret);
const void *value, size_t size,
struct wim_lookup_table *lookup_table);
+bool
+inode_has_named_stream(const struct wim_inode *inode);
+
extern int
inode_set_unnamed_stream(struct wim_inode *inode, const void *data, size_t len,
struct wim_lookup_table *lookup_table);
#define WIMLIB_UNIX_DATA_TAG_UTF16LE "$\0$\0_\0_\0w\0i\0m\0l\0i\0b\0_\0U\0N\0I\0X\0_\0d\0a\0t\0a\0"
#define WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES (sizeof(WIMLIB_UNIX_DATA_TAG_UTF16LE) - 1)
+static inline bool
+ads_entry_is_unix_data(const struct wim_ads_entry *entry)
+{
+ return (entry->stream_name_nbytes ==
+ WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES) &&
+ !memcmp(entry->stream_name, WIMLIB_UNIX_DATA_TAG_UTF16LE,
+ WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES);
+}
+
+static inline bool
+ads_entry_is_named_stream(const struct wim_ads_entry *entry)
+{
+ return entry->stream_name_nbytes != 0 && !ads_entry_is_unix_data(entry);
+}
+
+#ifndef __WIN32__
/* Format for special alternate data stream entries to store UNIX data for files
* and directories (see: WIMLIB_ADD_FLAG_UNIX_DATA) */
struct wimlib_unix_data {
u16 mode;
} _packed_attribute;
-#ifndef __WIN32__
-
#define NO_UNIX_DATA (-1)
#define BAD_UNIX_DATA (-2)
extern int
extern int
inode_set_unix_data(struct wim_inode *inode, uid_t uid, gid_t gid, mode_t mode,
struct wim_lookup_table *lookup_table, int which);
-#endif
+#endif /* !__WIN32__ */
+
+extern bool
+inode_has_unix_data(const struct wim_inode *inode);
extern int
read_dentry(const u8 * restrict metadata_resource,
== FILE_ATTRIBUTE_DIRECTORY;
}
+static inline bool
+inode_is_encrypted_directory(const struct wim_inode *inode)
+{
+ return ((inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
+ FILE_ATTRIBUTE_ENCRYPTED))
+ == (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ENCRYPTED));
+}
+
static inline bool
dentry_is_directory(const struct wim_dentry *dentry)
{
git://wimlib.net / wimlib / blobdiff