X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwimlib_internal.h;h=08a176cf277d7855428292ef93cce17a1001fd5d;hb=1c951ec1b14d60c43fbb0f5e80b0d0e82ce4cf91;hp=65dd8a1d7f4acf41c1956d962a732e92dc2203bb;hpb=4f953b223bed60d71a7689d414ccb5cc60be537f;p=wimlib diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index 65dd8a1d..08a176cf 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -198,7 +198,7 @@ struct wim_header { #define WIM_HDR_FLAG_WRITE_IN_PROGRESS 0x00000040 /* Reparse point fixup flag. See docs for --rpfix and --norpfix in imagex, or - * WIMLIB_ADD_IMAGE_FLAG_{RPFIX,NORPFIX} in wimlib.h. Note that + * WIMLIB_ADD_FLAG_{RPFIX,NORPFIX} in wimlib.h. Note that * WIM_HDR_FLAG_RP_FIX is a header flag and just sets the default behavior for * the WIM; it can still be overridder on a per-image basis. But there is no * flag to set the default behavior for a specific image. */ @@ -282,12 +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 descriptor, opened either for writing only or for * reading+writing, for the WIM file (if any) currently being written. * */ - filedes_t out_fd; + int out_fd; /* The name of the WIM file (if any) that has been opened. */ tchar *filename; @@ -313,7 +313,9 @@ struct WIMStruct { * image_metadata array. */ int current_image; + /* Have any images been deleted? */ u8 deletion_occurred : 1; + u8 all_images_verified : 1; u8 wim_locked : 1; }; @@ -437,8 +439,8 @@ struct add_image_params { * files should be excluded from capture or not. */ const struct wimlib_capture_config *config; - /* Flags that affect the capture operation (WIMLIB_ADD_IMAGE_FLAG_*) */ - int add_image_flags; + /* Flags that affect the capture operation (WIMLIB_ADD_FLAG_*) */ + int add_flags; /* If non-NULL, the user-supplied progress function. */ wimlib_progress_func_t progress_func; @@ -451,11 +453,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 */ @@ -493,10 +508,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); @@ -508,7 +524,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, @@ -519,10 +535,12 @@ check_wim_integrity(WIMStruct *w, wimlib_progress_func_t progress_func); /* join.c */ -extern int -new_joined_lookup_table(WIMStruct *w, WIMStruct **additional_swms, - unsigned num_additional_swms, - struct wim_lookup_table **table_ret); +extern void +merge_lookup_tables(WIMStruct *w, + WIMStruct **additional_swms, unsigned num_additional_swms); + +extern void +unmerge_lookup_table(WIMStruct *wim); /* metadata_resource.c */ @@ -538,6 +556,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; @@ -558,6 +579,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 @@ -689,7 +711,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); @@ -710,6 +732,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); @@ -722,6 +747,30 @@ write_security_data(const struct wim_security_data *sd, u8 *p); extern void free_security_data(struct wim_security_data *sd); +/* unix_apply.c */ +#ifndef __WIN32__ +extern int +unix_do_apply_dentry(const char *output_path, size_t output_path_len, + struct wim_dentry *dentry, struct apply_args *args); +extern int +unix_do_apply_dentry_timestamps(const char *output_path, + size_t output_path_len, + struct wim_dentry *dentry, + struct apply_args *args); +#endif + +/* 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,11 +827,7 @@ close_wim(WIMStruct *w); #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 +#define WIMLIB_ADD_FLAG_ROOT 0x80000000 extern int begin_write(WIMStruct *w, const tchar *path, int write_flags); @@ -796,10 +841,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; }