X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=abd0b86c11be76d4f2222ce7732a403671ea0914;hp=157a11748d14e6ab47b385e124375f5a67bd770b;hb=de2db344b0d8a48b52c4cfaf0dbf35da9ffc6678;hpb=6f77434ea6ff1407603410e28d1edb966c40e568 diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index 157a1174..abd0b86c 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -31,7 +31,6 @@ struct stat; -#define WIM_HASH_SIZE 20 #define WIM_MAGIC_LEN 8 #define WIM_GID_LEN 16 #define WIM_UNUSED_LEN 60 @@ -44,8 +43,8 @@ struct stat; * of this size. */ #define WIM_CHUNK_SIZE 32768 -/* Version of the WIM file. I don't know if there has ever been a different - * version or not. */ +/* Version of the WIM file. There is an older version, but we don't support it + * yet. The differences between the versions are undocumented. */ #define WIM_VERSION 0x10d00 enum wim_integrity_status { @@ -183,7 +182,6 @@ struct wim_header { #define WIM_HDR_FLAG_COMPRESS_LZX 0x00040000 -#ifdef ENABLE_SECURITY_DATA /* Structure for security data. Each image in the WIM file has its own security * data. */ struct wim_security_data { @@ -204,21 +202,25 @@ struct wim_security_data { /* keep track of how many WIMs reference this security data (used when * exporting images between WIMs) */ u32 refcnt; -} WIMSecurityData; -#endif +}; + +struct link_group_table; + /* Metadata resource for an image. */ struct image_metadata { /* Pointer to the root dentry for the image. */ struct dentry *root_dentry; -#ifdef ENABLE_SECURITY_DATA /* Pointer to the security data for the image. */ struct wim_security_data *security_data; -#endif + + /* Hard link group table */ + struct link_group_table *lgt; + /* A pointer to the lookup table entry for this image's metadata * resource. */ - struct lookup_table_entry *lookup_table_entry; + struct lookup_table_entry *metadata_lte; /* 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 @@ -231,19 +233,19 @@ struct image_metadata { typedef struct WIMStruct { /* A pointer to the file indicated by @filename, opened for reading. */ - FILE *fp; + FILE *fp; /* FILE pointer for the WIM file that is being written. */ 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. */ @@ -253,31 +255,22 @@ typedef struct WIMStruct { * WIM has a image metadata associated with it. */ struct image_metadata *image_metadata; - /* Name of the output directory for extraction. */ - char *output_dir; - /* The header of the WIM file. */ struct wim_header hdr; - /* The type of links to create when extracting files (hard, symbolic, or - * none.) */ - int link_type; + /* Temporary flags to use when extracting a WIM image or adding a WIM + * image. */ + union { + int extract_flags; + int add_flags; + int write_flags; + bool write_metadata; + }; /* The currently selected image, indexed starting at 1. If not 0, * subtract 1 from this to get the index of the current image in the * image_metadata array. */ - int current_image; - - /* True if files names are to be printed when doing extraction. - * May be used for other things later. */ - bool verbose; - - union { - /* Set to true when extracting multiple images */ - bool is_multi_image_extraction; - - bool write_metadata; - }; + int current_image; } WIMStruct; @@ -288,22 +281,21 @@ static inline struct dentry *wim_root_dentry(WIMStruct *w) return w->image_metadata[w->current_image - 1].root_dentry; } -static inline struct dentry **wim_root_dentry_p(WIMStruct *w) +static inline struct wim_security_data * +wim_security_data(WIMStruct *w) { - return &w->image_metadata[w->current_image - 1].root_dentry; + return w->image_metadata[w->current_image - 1].security_data; } - -#ifdef ENABLE_SECURITY_DATA -static inline struct wim_security_data *wim_security_data(WIMStruct *w) +static inline const struct wim_security_data * +wim_const_security_data(const WIMStruct *w) { return w->image_metadata[w->current_image - 1].security_data; } -#endif static inline struct lookup_table_entry* wim_metadata_lookup_table_entry(WIMStruct *w) { - return w->image_metadata[w->current_image - 1].lookup_table_entry; + return w->image_metadata[w->current_image - 1].metadata_lte; } /* Nonzero if a struct resource_entry indicates a compressed resource. */ @@ -312,21 +304,20 @@ static inline int resource_is_compressed(const struct resource_entry *entry) return (entry->flags & WIM_RESHDR_FLAG_COMPRESSED); } -static inline struct image_metadata *wim_get_current_image_metadata(WIMStruct *w) +static inline struct image_metadata * +wim_get_current_image_metadata(WIMStruct *w) { return &w->image_metadata[w->current_image - 1]; } -static inline bool wim_current_image_is_modified(const WIMStruct *w) -{ - return w->image_metadata[w->current_image - 1].modified; -} +/* hardlink.c */ -/* Prints a hash code field. */ -static inline void print_hash(const u8 hash[]) -{ - print_byte_field(hash, WIM_HASH_SIZE); -} +struct link_group_table *new_link_group_table(u64 capacity); +int link_group_table_insert(struct dentry *dentry, + void *__table); +void free_link_group_table(struct link_group_table *table); +u64 assign_link_groups(struct link_group_table *table); +int link_groups_free_duplicate_data(struct link_group_table *table); /* header.c */ @@ -340,69 +331,59 @@ extern int write_integrity_table(FILE *out, u64 end_header_offset, int show_progress); extern int check_wim_integrity(WIMStruct *w, int show_progress, int *status); +/* modify.c */ +extern void destroy_image_metadata(struct image_metadata *imd, + struct lookup_table *lt); /* resource.c */ extern const u8 *get_resource_entry(const u8 *p, struct resource_entry *entry); extern u8 *put_resource_entry(u8 *p, const struct resource_entry *entry); -extern int read_resource(FILE *fp, u64 resource_size, - u64 resource_original_size, - u64 resource_offset, int resource_ctype, u64 len, - u64 offset, void *contents_ret); +extern int read_uncompressed_resource(FILE *fp, u64 offset, u64 size, u8 buf[]); -extern int read_uncompressed_resource(FILE *fp, u64 offset, u64 len, - u8 contents_ret[]); +extern int read_wim_resource(const struct lookup_table_entry *lte, u8 buf[], + size_t size, u64 offset, bool raw); +extern int read_full_wim_resource(const struct lookup_table_entry *lte, u8 buf[]); -extern int extract_resource_to_fd(WIMStruct *w, - const struct resource_entry *entry, - int fd, - u64 size); +extern int extract_wim_resource_to_fd(const struct lookup_table_entry *lte, + int fd, u64 size); -extern int extract_full_resource_to_fd(WIMStruct *w, - const struct resource_entry *entry, - int fd); -extern int read_metadata_resource(FILE *fp, - const struct resource_entry *metadata, - int wim_ctype, - struct image_metadata *image_metadata); +extern int extract_full_wim_resource_to_fd(const struct lookup_table_entry *lte, + int fd); -extern int resource_compression_type(int wim_ctype, int reshdr_flags); +extern int read_metadata_resource(FILE *fp, int wim_ctype, + struct image_metadata *image_metadata); -static inline int read_full_resource(FILE *fp, u64 resource_size, - u64 resource_original_size, - u64 resource_offset, - int resource_ctype, void *contents_ret) -{ - return read_resource(fp, resource_size, resource_original_size, - resource_offset, resource_ctype, - resource_original_size, 0, contents_ret); -} -extern int write_file_resource(struct dentry *dentry, void *wim_p); +extern int write_dentry_resources(struct dentry *dentry, void *wim_p); extern int copy_resource(struct lookup_table_entry *lte, void *w); -extern int copy_between_files(FILE *in, off_t in_offset, FILE *out, size_t len); -extern int write_resource_from_memory(const u8 resource[], int out_ctype, - u64 resource_original_size, FILE *out, - u64 *resource_size_ret); extern int write_metadata_resource(WIMStruct *w); -#ifdef ENABLE_SECURITY_DATA + +/* security.c */ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, struct wim_security_data **sd_p); void print_security_data(const struct wim_security_data *sd); u8 *write_security_data(const struct wim_security_data *sd, u8 *p); void free_security_data(struct wim_security_data *sd); -#endif + +/* symlink.c */ +ssize_t dentry_readlink(const struct dentry *dentry, char *buf, size_t buf_len, + const WIMStruct *w); +extern void *make_symlink_reparse_data_buf(const char *symlink_target, + size_t *len_ret); +extern int dentry_set_symlink(struct dentry *dentry, + const char *target, + struct lookup_table *lookup_table, + struct lookup_table_entry **lte_ret); /* wim.c */ extern WIMStruct *new_wim_struct(); extern int wimlib_select_image(WIMStruct *w, int image); extern int wim_hdr_flags_compression_type(int wim_hdr_flags); -extern int wim_resource_compression_type(const WIMStruct *w, - const struct resource_entry *entry); extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *)); /* write.c */