X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=a54e644cfddee8e8f5bb4759821fb09986534fcc;hb=fcc8d33acee4c9ab11ebe975da030c6e53b182e3;hp=10784571a0118eee4b00627f5d9866e08a8a2a3a;hpb=aee5df8a6702da0782d64333eb8b3d1fb52c880b;p=wimlib diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index 10784571..a54e644c 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. */ @@ -280,18 +280,14 @@ struct wim_image_metadata { /* The opaque structure exposed to the wimlib API. */ struct WIMStruct { - /* A pointer to the file indicated by @filename, opened for reading. */ - FILE *fp; + /* 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. */ + int in_fd; -#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION) - /* Extra file pointers to be used by concurrent readers */ - FILE **fp_tab; - size_t num_allocated_fps; - pthread_mutex_t fp_tab_mutex; -#endif - - /* FILE pointer for the WIM file (if any) currently being written. */ - FILE *out_fp; + /* 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; @@ -317,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; }; @@ -441,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; @@ -455,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 */ @@ -474,7 +485,8 @@ 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); + u64 ino, u64 devno, bool noshare, + struct wim_dentry **dentry_ret); extern void inode_ref_streams(struct wim_inode *inode); @@ -496,10 +508,11 @@ dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list); /* header.c */ extern int -read_header(FILE *fp, 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, FILE *out); +write_header(const struct wim_header *hdr, int out_fd); extern int init_header(struct wim_header *hdr, int ctype); @@ -511,7 +524,8 @@ init_header(struct wim_header *hdr, int ctype); #define WIM_INTEGRITY_NONEXISTENT -2 extern int -write_integrity_table(FILE *out, struct resource_entry *integrity_res_entry, +write_integrity_table(int fd, + struct resource_entry *integrity_res_entry, off_t new_lookup_table_end, off_t old_lookup_table_end, wimlib_progress_func_t progress_func); @@ -540,6 +554,11 @@ 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; union wimlib_progress_info progress; wimlib_progress_func_t progress_func; @@ -551,18 +570,22 @@ struct apply_args { struct _ntfs_volume *vol; }; #endif - struct { - /* Normal apply only (UNIX) */ - unsigned long num_utime_warnings; - }; - + #ifdef __WIN32__ struct { /* Normal apply only (Win32) */ unsigned long num_set_sacl_priv_notheld; 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 + struct { + /* Normal apply only (UNIX) */ + unsigned long num_utime_warnings; + }; + #endif }; }; @@ -595,10 +618,77 @@ extern int do_ntfs_umount(struct _ntfs_volume *vol); #endif +/* reparse.c */ + +/* Structured format for symbolic link, junction point, or mount point reparse + * data. */ +struct reparse_data { + /* Reparse point tag (see WIM_IO_REPARSE_TAG_* values) */ + u32 rptag; + + /* Length of reparse data, not including the 8-byte header (ReparseTag, + * ReparseDataLength, ReparseReserved) */ + u16 rpdatalen; + + /* ReparseReserved */ + u16 rpreserved; + + /* Flags (only for WIM_IO_REPARSE_TAG_SYMLINK reparse points). + * SYMBOLIC_LINK_RELATIVE means this is a relative symbolic link; + * otherwise should be set to 0. */ +#define SYMBOLIC_LINK_RELATIVE 0x00000001 + u32 rpflags; + + /* Pointer to the substitute name of the link (UTF-16LE). */ + utf16lechar *substitute_name; + + /* Pointer to the print name of the link (UTF-16LE). */ + utf16lechar *print_name; + + /* Number of bytes of the substitute name, not including null terminator + * if present */ + u16 substitute_name_nbytes; + + /* Number of bytes of the print name, not including null terminator if + * present */ + u16 print_name_nbytes; +}; + +enum { + SUBST_NAME_IS_RELATIVE_LINK = -1, + SUBST_NAME_IS_VOLUME_JUNCTION = -2, + SUBST_NAME_IS_UNKNOWN = -3, +}; +extern int +parse_substitute_name(const utf16lechar *substitute_name, + u16 substitute_name_nbytes, + u32 rptag); + +extern int +parse_reparse_data(const u8 *rpbuf, u16 rpbuflen, struct reparse_data *rpdata); + +extern int +make_reparse_buffer(const struct reparse_data *rpdata, u8 *buf); + +extern int +wim_inode_get_reparse_data(const struct wim_inode *inode, u8 *rpbuf); + +#ifndef __WIN32__ +ssize_t +wim_inode_readlink(const struct wim_inode *inode, char *buf, size_t buf_len); + +extern int +wim_inode_set_symlink(struct wim_inode *inode, const char *target, + struct wim_lookup_table *lookup_table); +#endif +extern tchar * +capture_fixup_absolute_symlink(tchar *dest, + u64 capture_root_ino, u64 capture_root_dev); + + /* resource.c */ #define WIMLIB_RESOURCE_FLAG_RAW 0x1 -#define WIMLIB_RESOURCE_FLAG_THREADSAFE_READ 0x2 #define WIMLIB_RESOURCE_FLAG_RECOMPRESS 0x4 extern int @@ -612,19 +702,14 @@ get_resource_entry(const void *p, struct resource_entry *entry); extern void * put_resource_entry(void *p, const struct resource_entry *entry); -extern int -read_uncompressed_resource(FILE *fp, u64 offset, u64 size, void *buf); - extern int read_partial_wim_resource_into_buf(const struct wim_lookup_table_entry *lte, - size_t size, u64 offset, void *buf, - bool threadsafe); + size_t size, u64 offset, void *buf); extern int -read_full_resource_into_buf(const struct wim_lookup_table_entry *lte, - void *buf, bool thread_safe); +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, FILE *out_fp, +write_wim_resource(struct wim_lookup_table_entry *lte, int out_fd, int out_ctype, struct resource_entry *out_res_entry, int flags); @@ -645,6 +730,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); @@ -657,19 +745,30 @@ write_security_data(const struct wim_security_data *sd, u8 *p); extern void free_security_data(struct wim_security_data *sd); -/* symlink.c */ - +/* unix_apply.c */ #ifndef __WIN32__ -ssize_t -inode_readlink(const struct wim_inode *inode, char *buf, size_t buf_len, - const WIMStruct *w, bool threadsafe); +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 -inode_set_symlink(struct wim_inode *inode, const char *target, - struct wim_lookup_table *lookup_table, - struct wim_lookup_table_entry **lte_ret); +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 @@ -711,6 +810,12 @@ new_image_metadata_array(unsigned num_images); extern int wim_checksum_unhashed_streams(WIMStruct *w); +extern int +reopen_wim(WIMStruct *w); + +extern int +close_wim(WIMStruct *w); + /* write.c */ /* Internal use only */ @@ -720,11 +825,7 @@ wim_checksum_unhashed_streams(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); @@ -738,10 +839,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, FILE *fp); +lock_wim(WIMStruct *w, int fd); #else static inline int -lock_wim(WIMStruct *w, FILE *fp) +lock_wim(WIMStruct *w, int fd) { return 0; }