WIM update fixes

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index db8d03518a04fab4b37a3be38bf6690ebec8e709..55fcd8f308ad17d3dbb8fc884ce66b10337f0587 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -282,10 +282,12 @@ struct WIMStruct {
 
        /* File descriptor for the WIM file, opened for reading, or -1 if it has
         * not been opened or there is no associated file backing it yet. */
-       filedes_t in_fd;
+       int in_fd;
 
-       /* FILE pointer for the WIM file (if any) currently being written. */
-       filedes_t out_fd;
+       /* File descriptor, opened either for writing only or for
+        * reading+writing, for the WIM file (if any) currently being written.
+        * */
+       int out_fd;
 
        /* The name of the WIM file (if any) that has been opened. */
        tchar *filename;
@@ -449,11 +451,24 @@ struct add_image_params {
        u64 capture_root_dev;
 };
 
+
+/* capture_common.c */
+
 extern bool
 exclude_path(const tchar *path, size_t path_len,
             const struct wimlib_capture_config *config,
             bool exclude_prefix);
 
+extern struct wimlib_capture_config *
+copy_capture_config(const struct wimlib_capture_config *config);
+
+extern int
+copy_and_canonicalize_capture_config(const struct wimlib_capture_config *config,
+                                    struct wimlib_capture_config **config_copy_ret);
+
+extern void
+free_capture_config(struct wimlib_capture_config *config);
+
 /* extract_image.c */
 
 /* Internal use only */
@@ -491,10 +506,11 @@ dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list);
 /* header.c */
 
 extern int
-read_header(filedes_t in_fd, struct wim_header *hdr, int split_ok);
+read_header(const tchar *filename, int in_fd, struct wim_header *hdr,
+           int split_ok);
 
 extern int
-write_header(const struct wim_header *hdr, filedes_t out_fd);
+write_header(const struct wim_header *hdr, int out_fd);
 
 extern int
 init_header(struct wim_header *hdr, int ctype);
@@ -506,7 +522,7 @@ init_header(struct wim_header *hdr, int ctype);
 #define WIM_INTEGRITY_NONEXISTENT -2
 
 extern int
-write_integrity_table(filedes_t fd,
+write_integrity_table(int fd,
                      struct resource_entry *integrity_res_entry,
                      off_t new_lookup_table_end,
                      off_t old_lookup_table_end,
@@ -536,6 +552,9 @@ write_metadata_resource(WIMStruct *w);
 struct apply_args {
        WIMStruct *w;
        const tchar *target;
+       unsigned target_nchars;
+       unsigned wim_source_path_nchars;
+       struct wim_dentry *extract_root;
        tchar *target_realpath;
        unsigned target_realpath_len;
        int extract_flags;
@@ -556,6 +575,7 @@ struct apply_args {
                        unsigned long num_set_sd_access_denied;
                        unsigned vol_flags;
                        unsigned long num_hard_links_failed;
+                       unsigned long num_soft_links_failed;
                        bool have_vol_flags;
                };
        #else
@@ -687,7 +707,7 @@ extern int
 read_full_resource_into_buf(const struct wim_lookup_table_entry *lte, void *buf);
 
 extern int
-write_wim_resource(struct wim_lookup_table_entry *lte, filedes_t out_fd,
+write_wim_resource(struct wim_lookup_table_entry *lte, int out_fd,
                   int out_ctype, struct resource_entry *out_res_entry,
                   int flags);
 
@@ -708,6 +728,9 @@ extern int
 copy_resource(struct wim_lookup_table_entry *lte, void *w);
 
 /* security.c */
+extern struct wim_security_data *
+new_wim_security_data();
+
 extern int
 read_security_data(const u8 metadata_resource[],
                   u64 metadata_resource_len, struct wim_security_data **sd_p);
@@ -720,6 +743,18 @@ write_security_data(const struct wim_security_data *sd, u8 *p);
 extern void
 free_security_data(struct wim_security_data *sd);
 
+/* unix_capture.c */
+#ifndef __WIN32__
+extern int
+unix_build_dentry_tree(struct wim_dentry **root_ret,
+                      const char *root_disk_path,
+                      struct add_image_params *params);
+#endif
+
+/* update_image.c */
+extern int
+rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to);
+
 /* verify.c */
 
 extern int
@@ -778,10 +813,6 @@ close_wim(WIMStruct *w);
 /* 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 tchar *path, int write_flags);
 
@@ -794,10 +825,10 @@ finish_write(WIMStruct *w, int image, int write_flags,
 
 #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
 extern int
-lock_wim(WIMStruct *w, filedes_t fd);
+lock_wim(WIMStruct *w, int fd);
 #else
 static inline int
-lock_wim(WIMStruct *w, filedes_t fd)
+lock_wim(WIMStruct *w, int fd)
 {
        return 0;
 }