X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=410281913c103431636feebaf9be3621e1dc2518;hp=f9a4ad8af5a6a1138868e9cd0baae00fe2057047;hb=52cccded7706cd556f78ce7d2506937d2a216293;hpb=67f45cecd793345416d5d85fbe37ec54b1bb6ef8 diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index f9a4ad8a..41028191 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -27,10 +27,16 @@ #ifndef _WIMLIB_INTERNAL_H #define _WIMLIB_INTERNAL_H +#include "config.h" #include "util.h" +#include "list.h" + +#ifdef WITH_FUSE +#include +#endif struct stat; -struct hlist_head; +struct dentry; struct inode; #define WIM_MAGIC_LEN 8 @@ -94,10 +100,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; @@ -115,7 +121,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]; @@ -141,7 +147,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.*/ @@ -176,7 +182,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 @@ -206,7 +212,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). */ @@ -238,6 +244,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. */ @@ -245,19 +253,28 @@ 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; +#ifdef WITH_FUSE + 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; /* 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. */ @@ -281,6 +298,7 @@ typedef struct WIMStruct { int add_flags; int write_flags; bool write_metadata; + void *private; }; #ifdef WITH_NTFS_3G struct _ntfs_volume *ntfs_vol; @@ -347,9 +365,34 @@ struct capture_config { /* hardlink.c */ -struct inode_table *new_inode_table(size_t capacity); +/* Hash table to find inodes, identified by their inode ID. + * */ +struct inode_table { + /* Fields for the hash table */ + struct hlist_head *array; + 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 + * inode number, meaning we cannot insert them into the hash table + * before calling assign_inode_numbers(). + * + * - Groups we create ourselves by splitting a nominal inode due to + * inconsistencies in the dentries. These inodes will share a inode + * ID with some other inode until assign_inode_numbers() is called. + */ + struct hlist_head extra_inodes; +}; + +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); -void free_inode_table(struct inode_table *table); u64 assign_inode_numbers(struct hlist_head *inode_list); int fix_inodes(struct inode_table *table, struct hlist_head *inode_list); @@ -360,7 +403,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); @@ -385,8 +428,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); @@ -398,9 +441,15 @@ 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 write_wim_resource(struct lookup_table_entry *lte, + FILE *out_fp, int out_ctype, + struct resource_entry *out_res_entry, + int flags); extern int extract_wim_resource_to_fd(const struct lookup_table_entry *lte, int fd, u64 size); @@ -419,7 +468,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); @@ -428,7 +477,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, @@ -438,15 +487,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"