unix_capture.c: Include <limits.h> for PATH_MAX

[wimlib] / src / dentry.h

diff --git a/src/dentry.h b/src/dentry.h
index 5e42e91f7c39c0909b39e0d8c63b587f4b4a99f0..1500bd7c3c63238ff07baeadb0b59ddb2c9d33be 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -78,12 +78,16 @@ struct wim_ads_entry {
         * terminating null character. */
        u16 stream_name_nbytes;
 
-       /* Stream name (UTF-16LE) */
-       utf16lechar *stream_name;
-
        /* Number to identify an alternate data stream even after it's possibly
         * been moved or renamed. */
        u32 stream_id;
+
+       /* Stream name (UTF-16LE) */
+       utf16lechar *stream_name;
+
+       /* Unused field.  We read it into memory so we can write it out
+        * unchanged. */
+       u64 unused;
 };
 
 
@@ -143,8 +147,8 @@ struct wim_dentry {
         * including the terminating null character. */
        u32 full_path_nbytes;
 
-       /* Has this dentry been extracted yet? */
-       u8 is_extracted : 1;
+       /* Does this dentry need to be extracted? */
+       u8 needs_extraction : 1;
 
        /* Only used during NTFS capture */
        u8 is_win32_name : 1;
@@ -231,13 +235,20 @@ struct wim_inode {
        /* Used only in NTFS-mode extraction */
        u8 i_dos_name_extracted : 1;
 
+       /* Set to 0 if reparse point fixups have been done.  Otherwise set to 1.
+        *
+        * Note: this actually may reflect the SYMBOLIC_LINK_RELATIVE flag.  */
        u16 i_not_rpfixed;
 
        /* Number of alternate data streams associated with this inode */
        u16 i_num_ads;
 
-       u16 i_rp_unknown_2;
+       /* Unused/unknown fields that we just read into memory so we can
+        * re-write them unchanged.  */
+       u64 i_unused_1;
+       u64 i_unused_2;
        u32 i_rp_unknown_1;
+       u16 i_rp_unknown_2;
 
        /* A hash of the file's contents, or a pointer to the lookup table entry
         * for this dentry if the lookup table entries have been resolved.
@@ -264,6 +275,9 @@ struct wim_inode {
        /* Inode number */
        u64 i_ino;
 
+       /* Device number, used only during image capture */
+       u64 i_devno;
+
        /* List of dentries that reference this inode (there should be
         * link_count of them) */
        struct list_head i_dentry;
@@ -273,15 +287,6 @@ struct wim_inode {
                struct list_head i_list;
        };
 
-       union {
-               /* Used during image extraction to build a list of inodes that
-                * share a certain stream */
-               struct list_head i_lte_inode_list;
-
-               /* Device number, used only during image capture */
-               u64 i_devno;
-       };
-
        tchar *i_extracted_file;
 
        /* Root of a red-black tree storing the children of this inode (if
@@ -395,6 +400,9 @@ new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret);
 extern int
 new_dentry_with_timeless_inode(const tchar *name, struct wim_dentry **dentry_ret);
 
+extern int
+new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret);
+
 extern void
 free_inode(struct wim_inode *inode);
 
@@ -411,7 +419,7 @@ free_dentry_tree(struct wim_dentry *root,
 extern void
 unlink_dentry(struct wim_dentry *dentry);
 
-extern bool
+extern struct wim_dentry *
 dentry_add_child(struct wim_dentry * restrict parent,
                 struct wim_dentry * restrict child);
 
@@ -432,6 +440,10 @@ inode_add_ads_with_data(struct wim_inode *inode, const tchar *name,
                        const void *value, size_t size,
                        struct wim_lookup_table *lookup_table);
 
+extern int
+inode_set_unnamed_stream(struct wim_inode *inode, const void *data, size_t len,
+                        struct wim_lookup_table *lookup_table);
+
 extern void
 inode_remove_ads(struct wim_inode *inode, u16 idx,
                 struct wim_lookup_table *lookup_table);
@@ -444,7 +456,7 @@ inode_remove_ads(struct wim_inode *inode, u16 idx,
 #define WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES (sizeof(WIMLIB_UNIX_DATA_TAG_UTF16LE) - 1)
 
 /* Format for special alternate data stream entries to store UNIX data for files
- * and directories (see: WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) */
+ * and directories (see: WIMLIB_ADD_FLAG_UNIX_DATA) */
 struct wimlib_unix_data {
        u16 version; /* Must be 0 */
        u16 uid;