X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=194978342346008a2c81fe21bc6adafc3a85c491;hp=9af0f3360255571a07aaf8de40712d0207733a5d;hb=7c83ef53090441de11cc78d8d26dc337cd7ac475;hpb=6cca349b45e66a2b2b82aa5dcd269a4bf61c50db diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index 9af0f336..19497834 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -27,10 +27,15 @@ #ifndef _WIMLIB_INTERNAL_H #define _WIMLIB_INTERNAL_H +#include "config.h" #include "util.h" #include "list.h" +#include "wimlib.h" + +#ifdef WITH_FUSE #include +#endif struct stat; struct dentry; @@ -52,11 +57,9 @@ struct inode; * yet. The differences between the versions are undocumented. */ #define WIM_VERSION 0x10d00 -enum wim_integrity_status { - WIM_INTEGRITY_OK, - WIM_INTEGRITY_NOT_OK, - WIM_INTEGRITY_NONEXISTENT, -}; +#define WIM_INTEGRITY_OK 0 +#define WIM_INTEGRITY_NOT_OK -1 +#define WIM_INTEGRITY_NONEXISTENT -2 /* Metadata for a resource in a WIM file. */ struct resource_entry { @@ -246,52 +249,53 @@ struct image_metadata { /* True if the filesystem of the image has been modified. If this is * the case, the memory for the filesystem is not freed when switching * to a different WIM image. */ - bool modified; + u8 modified : 1; + u8 has_been_mounted_rw : 1; }; #define WIMLIB_RESOURCE_FLAG_RAW 0x1 #define WIMLIB_RESOURCE_FLAG_MULTITHREADED 0x2 +#define WIMLIB_RESOURCE_FLAG_RECOMPRESS 0x4 /* The opaque structure exposed to the wimlib API. */ -typedef struct WIMStruct { +struct WIMStruct { /* A pointer to the file indicated by @filename, opened for reading. */ - FILE *fp; + FILE *fp; +#ifdef WITH_FUSE + /* 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 that is being written. */ - FILE *out_fp; + FILE *out_fp; /* The name of the WIM file that has been opened. */ - char *filename; + char *filename; /* The lookup table for the WIM file. */ struct lookup_table *lookup_table; /* Pointer to the XML data read from the WIM file. */ - u8 *xml_data; + u8 *xml_data; /* Information retrieved from the XML data, arranged * in an orderly manner. */ - struct wim_info *wim_info; + struct wim_info *wim_info; /* Array of the image metadata of length image_count. Each image in the * WIM has a image metadata associated with it. */ - struct image_metadata *image_metadata; + struct image_metadata *image_metadata; /* The header of the WIM file. */ - struct wim_header hdr; + struct wim_header hdr; - /* Temporary flags to use when extracting a WIM image or adding a WIM - * image. */ + /* Temporary fields */ union { - int extract_flags; - int add_flags; - int write_flags; bool write_metadata; void *private; }; @@ -303,7 +307,10 @@ typedef struct WIMStruct { * subtract 1 from this to get the index of the current image in the * image_metadata array. */ int current_image; -} WIMStruct; + + /* %true iff any images have been deleted from this WIM. */ + bool deletion_occurred; +}; /* Inline utility functions for WIMStructs. */ @@ -382,14 +389,14 @@ struct inode_table { struct hlist_head extra_inodes; }; -int init_inode_table(struct inode_table *table, size_t capacity); +extern int init_inode_table(struct inode_table *table, size_t capacity); static inline void destroy_inode_table(struct inode_table *table) { FREE(table->array); } -int inode_table_insert(struct dentry *dentry, void *__table); -u64 assign_inode_numbers(struct hlist_head *inode_list); -int fix_inodes(struct inode_table *table, struct hlist_head *inode_list); +extern int inode_table_insert(struct dentry *dentry, void *__table); +extern u64 assign_inode_numbers(struct hlist_head *inode_list); +extern int fix_inodes(struct inode_table *table, struct hlist_head *inode_list); /* header.c */ @@ -398,10 +405,14 @@ extern int write_header(const struct wim_header *hdr, FILE *out); extern int init_header(struct wim_header *hdr, int ctype); /* integrity.c */ -extern int write_integrity_table(FILE *out, u64 end_header_offset, - u64 end_lookup_table_offset, - int show_progress); -extern int check_wim_integrity(WIMStruct *w, int show_progress, int *status); +extern int write_integrity_table(FILE *out, + struct resource_entry *integrity_res_entry, + off_t new_lookup_table_end, + off_t old_lookup_table_end, + wimlib_progress_func_t progress_func); + +extern int check_wim_integrity(WIMStruct *w, + wimlib_progress_func_t progress_func); /* join.c */ @@ -427,7 +438,37 @@ extern int do_add_image(WIMStruct *w, const char *dir, const char *name, struct wim_security_data *, const struct capture_config *, int, void *), - void *extra_arg); + void *extra_arg, + wimlib_progress_func_t progress_func); + +/* ntfs-apply.c */ + +struct apply_args { + WIMStruct *w; + const char *target; + int extract_flags; + unsigned num_lutimes_warnings; + struct list_head *stream_list; + union wimlib_progress_info progress; +#ifdef WITH_NTFS_3G + struct _ntfs_volume *vol; +#endif + struct list_head empty_files; + wimlib_progress_func_t progress_func; +}; + +extern int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg); +extern int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg); + +/* ntfs-capture.c */ +extern int build_dentry_tree_ntfs(struct dentry **root_p, + const char *device, + struct lookup_table *lookup_table, + struct wim_security_data *sd, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + void *extra_arg); /* resource.c */ extern const u8 *get_resource_entry(const u8 *p, struct resource_entry *entry); @@ -487,14 +528,22 @@ extern int wim_hdr_flags_compression_type(int wim_hdr_flags); extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *)); /* Internal use only */ -#define WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE 0x80000000 +#define WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE 0x80000000 +#define WIMLIB_WRITE_FLAG_REUSE_INTEGRITY_TABLE 0x40000000 +#define WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML 0x20000000 +#define WIMLIB_WRITE_MASK_PUBLIC 0x1fffffff + +/* Internal use only */ +#define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000 +#define WIMLIB_EXTRACT_FLAG_NO_STREAMS 0x40000000 +#define WIMLIB_EXTRACT_MASK_PUBLIC 0x3fffffff + /* write.c */ extern int begin_write(WIMStruct *w, const char *path, int write_flags); -extern int finish_write(WIMStruct *w, int image, int write_flags); - -#include "wimlib.h" +extern int finish_write(WIMStruct *w, int image, int write_flags, + wimlib_progress_func_t progress_func); #endif /* _WIMLIB_INTERNAL_H */