X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=fa40f6af80b9b6ba18fcae9b6c5a53e617f8c5ac;hp=c04ffb1aee312f47fc42ce518094840a17434875;hb=35dd893208119869db6a90b1d1663f9aea88a3f7;hpb=4d79cca5bd5027f96ca245b8e58c5ee2c31b5925 diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index c04ffb1a..fa40f6af 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -11,16 +11,16 @@ * This file is part of wimlib, a library for working with WIM files. * * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * A PARTICULAR PURPOSE. See the GNU General Public License for more * details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -31,10 +31,6 @@ struct stat; -#ifndef WIM_HASH_SIZE -#define WIM_HASH_SIZE 20 -#endif - #define WIM_MAGIC_LEN 8 #define WIM_GID_LEN 16 #define WIM_UNUSED_LEN 60 @@ -185,6 +181,7 @@ struct wim_header { * a LZ77-based algorithm. */ #define WIM_HDR_FLAG_COMPRESS_LZX 0x00040000 +typedef struct _ntfs_volume ntfs_volume; /* Structure for security data. Each image in the WIM file has its own security * data. */ @@ -194,8 +191,11 @@ 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. */ - u32 num_entries; + /* 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). */ + int32_t num_entries; /* Array of sizes of the descriptors in the array @descriptors. */ u64 *sizes; @@ -206,7 +206,7 @@ struct wim_security_data { /* keep track of how many WIMs reference this security data (used when * exporting images between WIMs) */ u32 refcnt; -} WIMSecurityData; +}; struct link_group_table; @@ -219,13 +219,13 @@ struct image_metadata { /* Pointer to the security data for the image. */ struct wim_security_data *security_data; + /* 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 *metadata_lte; - /* Hard link group table */ - struct link_group_table *lgt; - /* 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. */ @@ -237,19 +237,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. */ @@ -267,14 +267,17 @@ typedef struct WIMStruct { union { int extract_flags; int add_flags; + int write_flags; + bool write_metadata; }; +#ifdef WITH_NTFS_3G + ntfs_volume *ntfs_vol; +#endif /* 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; - - bool write_metadata; } WIMStruct; @@ -285,12 +288,13 @@ 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; } - -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; } @@ -307,25 +311,36 @@ 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]; } -/* Prints a hash code field. */ -static inline void print_hash(const u8 hash[]) -{ - print_byte_field(hash, WIM_HASH_SIZE); -} +struct pattern_list { + const char **pats; + size_t num_pats; + size_t num_allocated_pats; +}; + +struct capture_config { + struct pattern_list exclusion_list; + struct pattern_list exclusion_exception; + struct pattern_list compression_exclusion_list; + struct pattern_list alignment_list; + char *config_str; + char *prefix; + size_t prefix_len; +}; /* hardlink.c */ -struct link_group_table *new_link_group_table(u64 capacity); +struct link_group_table *new_link_group_table(size_t capacity); int link_group_table_insert(struct dentry *dentry, - struct link_group_table *table); + 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); +u64 assign_link_group_ids(struct link_group_table *table); +int fix_link_groups(struct link_group_table *table); /* header.c */ @@ -339,53 +354,56 @@ 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); +/* join.c */ + +extern int new_joined_lookup_table(WIMStruct *w, + WIMStruct **additional_swms, + unsigned num_additional_swms, + struct lookup_table **table_ret); + +extern int verify_swm_set(WIMStruct *w, + WIMStruct **additional_swms, + unsigned num_additional_swms); /* modify.c */ extern void destroy_image_metadata(struct image_metadata *imd, struct lookup_table *lt); +extern bool exclude_path(const char *path, + const struct capture_config *config, + bool exclude_prefix); +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 *, + const struct capture_config *, + int, void *), + void *extra_arg); /* 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, 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(WIMStruct *w, + 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_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); @@ -404,14 +422,13 @@ 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 *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 */