X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=8e1932166eec1551f881f59ca9c7c68b822b4363;hp=c7a3f8fec75a01364fa7077cba5605549ce7efdb;hb=051a59e4c6d114fc7abfa14ff78436adab5defb9;hpb=20e4ed048c57bd26e7f4da4b265aedbdd4f574a6 diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index c7a3f8fe..8e193216 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -30,6 +30,8 @@ #include "util.h" #include "list.h" +#include + struct stat; struct dentry; struct inode; @@ -95,10 +97,10 @@ struct resource_entry { /* Header at the very beginning of the WIM file. */ -struct wim_header { +struct wim_header { /* Identifies the file as WIM file. Must be exactly * {'M', 'S', 'W', 'I', 'M', 0, 0, 0} */ - //u8 magic[WIM_MAGIC_LEN]; + //u8 magic[WIM_MAGIC_LEN]; /* size of WIM header in bytes. */ //u32 hdr_size; @@ -116,7 +118,7 @@ struct wim_header { * WIM_CHUNK_SIZE. M$ incorrectly documents this as "the size of the * compressed .wim file in bytes".*/ //u32 chunk_size; - + /* A unique identifier for the WIM file. */ u8 guid[WIM_GID_LEN]; @@ -142,7 +144,7 @@ struct wim_header { /* The index of the bootable image in the WIM file. If 0, there are no * bootable images available. */ - u32 boot_idx; + u32 boot_idx; /* The location of the optional integrity table used to verify the * integrity WIM. Zeroed out if there is no integrity table.*/ @@ -177,7 +179,7 @@ struct wim_header { /* Lock field to prevent multiple writers from writing the WIM concurrently. We * ignore this flag. */ -#define WIM_HDR_FLAG_WRITE_IN_PROGRESS 0x00000040 +#define WIM_HDR_FLAG_WRITE_IN_PROGRESS 0x00000040 /* Reparse point fixup ??? * This has something to do with absolute targets of reparse points / symbolic @@ -207,7 +209,7 @@ struct wim_security_data { * that wimlib writes, currently), it will be 8 bytes. */ u32 total_length; - /* The number of security descriptors in the array @descriptors, below. + /* The number of security descriptors in the array @descriptors, below. * It is really an unsigned int, but it must fit into an int because the * security ID's are signed. (Not like you would ever have more than a * few hundred security descriptors anyway). */ @@ -239,6 +241,8 @@ struct image_metadata { * resource. */ struct lookup_table_entry *metadata_lte; + struct hlist_head inode_list; + /* 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. */ @@ -246,19 +250,26 @@ struct image_metadata { }; +#define WIMLIB_RESOURCE_FLAG_RAW 0x1 +#define WIMLIB_RESOURCE_FLAG_MULTITHREADED 0x2 + /* The opaque structure exposed to the wimlib API. */ typedef struct WIMStruct { /* A pointer to the file indicated by @filename, opened for reading. */ FILE *fp; + FILE **fp_tab; + size_t num_allocated_fps; + pthread_mutex_t fp_tab_mutex; + /* 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; - /* The lookup table for the WIM file. */ + /* The lookup table for the WIM file. */ struct lookup_table *lookup_table; /* Pointer to the XML data read from the WIM file. */ @@ -356,7 +367,7 @@ struct inode_table { u64 num_entries; u64 capacity; - /* + /* * Linked list of "extra" inodes. These may be: * * - inodes with link count 1, which are all allowed to have 0 for their @@ -386,7 +397,7 @@ 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, +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); @@ -411,8 +422,8 @@ extern int do_add_image(WIMStruct *w, const char *dir, const char *name, const char *config_str, size_t config_len, int flags, int (*capture_tree)(struct dentry **, const char *, - struct lookup_table *, - struct wim_security_data *, + struct lookup_table *, + struct wim_security_data *, const struct capture_config *, int, void *), void *extra_arg); @@ -424,9 +435,10 @@ extern u8 *put_resource_entry(u8 *p, const struct resource_entry *entry); extern int read_uncompressed_resource(FILE *fp, u64 offset, u64 size, u8 buf[]); extern int read_wim_resource(const struct lookup_table_entry *lte, u8 buf[], - size_t size, u64 offset, bool raw); + size_t size, u64 offset, int flags); -extern int read_full_wim_resource(const struct lookup_table_entry *lte, u8 buf[]); +extern int read_full_wim_resource(const struct lookup_table_entry *lte, + u8 buf[], int flags); extern int extract_wim_resource_to_fd(const struct lookup_table_entry *lte, int fd, u64 size); @@ -445,7 +457,7 @@ extern int write_metadata_resource(WIMStruct *w); /* security.c */ -int read_security_data(const u8 metadata_resource[], +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); @@ -454,7 +466,7 @@ void free_security_data(struct wim_security_data *sd); /* symlink.c */ ssize_t inode_readlink(const struct inode *inode, char *buf, size_t buf_len, - const WIMStruct *w); + const WIMStruct *w, int read_resource_flags); extern void *make_symlink_reparse_data_buf(const char *symlink_target, size_t *len_ret); extern int inode_set_symlink(struct inode *inode, @@ -464,15 +476,16 @@ extern int inode_set_symlink(struct inode *inode, /* wim.c */ extern WIMStruct *new_wim_struct(); -extern int wimlib_select_image(WIMStruct *w, int image); +extern int select_wim_image(WIMStruct *w, int image); extern int wim_hdr_flags_compression_type(int wim_hdr_flags); extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *)); -/* write.c */ -extern int finish_write(WIMStruct *w, int image, int flags, - int write_lookup_table); +/* Internal use only */ +#define WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE 0x80000000 -extern int begin_write(WIMStruct *w, const char *path, int flags); +/* 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"