WIM capture: Share inodes immediately

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 43331e2b41747383bf401c27b445b0ddc30a50b8..3d7fb488f519fdc55cc4f91ba224337886d80447 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -55,6 +55,7 @@
 struct stat;
 struct wim_dentry;
 struct wim_inode;
+struct sd_set;
 
 #define WIM_MAGIC_LEN  8
 #define WIM_GID_LEN    16
@@ -281,7 +282,7 @@ struct WIMStruct {
        FILE *out_fp;
 
        /* The name of the WIM file (if any) that has been opened. */
-       mbchar *filename;
+       tchar *filename;
 
        /* The lookup table for the WIM file. */
        struct wim_lookup_table *lookup_table;
@@ -299,11 +300,9 @@ struct WIMStruct {
        /* The header of the WIM file. */
        struct wim_header hdr;
 
-       /* Temporary fields */
-       union {
-               bool write_metadata;
-               void *private;
-       };
+       /* Temporary field */
+       void *private;
+
 #ifdef WITH_NTFS_3G
        struct _ntfs_volume *ntfs_vol;
 #endif
@@ -315,7 +314,6 @@ struct WIMStruct {
 
        u8 deletion_occurred : 1;
        u8 all_images_verified : 1;
-       u8 full_verification_in_progress : 1;
        u8 wim_locked : 1;
 };
 
@@ -353,23 +351,9 @@ resource_is_compressed(const struct resource_entry *entry)
 
 /* add_image.c */
 
-struct pattern_list {
-       const mbchar **pats;
-       size_t num_pats;
-       size_t num_allocated_pats;
-};
-
-struct capture_config {
-       struct pattern_list exclusion_list;
-       struct pattern_list exclusion_exception;
-       struct pattern_list compression_exclusion_list;
-       struct pattern_list alignment_list;
-       mbchar *config_str;
-       mbchar *prefix;
-       size_t prefix_len;
-};
 extern bool
-exclude_path(const mbchar *path, const struct capture_config *config,
+exclude_path(const tchar *path, size_t path_len,
+            const struct wimlib_capture_config *config,
             bool exclude_prefix);
 
 extern int
@@ -386,8 +370,46 @@ add_new_dentry_tree(WIMStruct *dest_wim, struct wim_dentry *root,
 
 /* hardlink.c */
 
-extern u64
-assign_inode_numbers(struct hlist_head *inode_list);
+/* Hash table to find inodes, given an inode number (in the case of reading
+ * a WIM images), or both an inode number and a device number (in the case of
+ * capturing a WIM image). */
+struct wim_inode_table {
+       /* Fields for the hash table */
+       struct hlist_head *array;
+       u64 num_entries;
+       u64 capacity;
+
+       /*
+        * Linked list of "extra" inodes.  These may be:
+        *
+        * - inodes with link count 1, which are all allowed to have 0 for their
+        *   inode number, meaning we cannot insert them into the hash table.
+         *
+        * - Groups we create ourselves by splitting a nominal inode due to
+        *   inconsistencies in the dentries.  These inodes will share an inode
+        *   number with some other inode until assign_inode_numbers() is
+        *   called.
+        */
+       struct hlist_head extra_inodes;
+};
+
+extern int
+init_inode_table(struct wim_inode_table *table, size_t capacity);
+
+extern int
+inode_table_new_dentry(struct wim_inode_table *table, const tchar *name,
+                      u64 ino, u64 devno, struct wim_dentry **dentry_ret);
+
+extern void
+inode_table_prepare_inode_list(struct wim_inode_table *table,
+                              struct hlist_head *head);
+
+static inline void
+destroy_inode_table(struct wim_inode_table *table)
+{
+       FREE(table->array);
+}
+
 
 extern int
 dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list);
@@ -438,16 +460,29 @@ write_metadata_resource(WIMStruct *w);
 
 struct apply_args {
        WIMStruct *w;
-       const mbchar *target;
+       const tchar *target;
        int extract_flags;
-       unsigned num_utime_warnings;
-       struct list_head *stream_list;
        union wimlib_progress_info progress;
-#ifdef WITH_NTFS_3G
-       struct _ntfs_volume *vol;
-#endif
        wimlib_progress_func_t progress_func;
        int (*apply_dentry)(struct wim_dentry *, void *);
+       union {
+       #ifdef WITH_NTFS_3G
+               struct {
+                       /* NTFS apply only */
+                       struct _ntfs_volume *vol;
+               };
+       #endif
+               struct {
+                       /* Normal apply only (UNIX) */
+                       unsigned long num_utime_warnings;
+               };
+
+               struct {
+                       /* Normal apply only (Win32) */
+                       unsigned long num_set_sacl_priv_notheld;
+                       unsigned long num_set_sd_access_denied;
+               };
+       };
 };
 
 extern int
@@ -462,10 +497,11 @@ libntfs3g_global_init();
 /* ntfs-capture.c */
 extern int
 build_dentry_tree_ntfs(struct wim_dentry **root_p,
-                      const mbchar *device,
+                      const tchar *device,
                       struct wim_lookup_table *lookup_table,
-                      struct wim_security_data *sd,
-                      const struct capture_config *config,
+                      struct wim_inode_table *inode_table,
+                      struct sd_set *sd_set,
+                      const struct wimlib_capture_config *config,
                       int add_image_flags,
                       wimlib_progress_func_t progress_func,
                       void *extra_arg);
@@ -545,14 +581,17 @@ extern void
 free_security_data(struct wim_security_data *sd);
 
 /* symlink.c */
+
+#ifndef __WIN32__
 ssize_t
 inode_readlink(const struct wim_inode *inode, char *buf, size_t buf_len,
               const WIMStruct *w, int read_resource_flags);
 
 extern int
-inode_set_symlink(struct wim_inode *inode, const mbchar *target,
+inode_set_symlink(struct wim_inode *inode, const char *target,
                  struct wim_lookup_table *lookup_table,
                  struct wim_lookup_table_entry **lte_ret);
+#endif
 
 /* verify.c */
 
@@ -586,12 +625,16 @@ destroy_image_metadata(struct wim_image_metadata *imd,
 #define WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML  0x20000000
 #define WIMLIB_WRITE_MASK_PUBLIC               0x1fffffff
 
+/* We are capturing a tree to be placed in the root of the WIM image */
 #define WIMLIB_ADD_IMAGE_FLAG_ROOT     0x80000000
+
+/* We are capturing a dentry that will become the root of a tree to be added to
+ * the WIM image */
 #define WIMLIB_ADD_IMAGE_FLAG_SOURCE    0x40000000
 
 
 extern int
-begin_write(WIMStruct *w, const mbchar *path, int write_flags);
+begin_write(WIMStruct *w, const tchar *path, int write_flags);
 
 extern void
 close_wim_writable(WIMStruct *w);