X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=28edf93ff510f28ae52c0fd7f870b69174d1b0f2;hb=91525408b4c14f6defd5c4d304515f564e0b3b01;hp=269f0a5b2898bd27a0803800d1fa7cbeb7886ab4;hpb=1449ca7e974c27bec75cb6784873be3c0e6eb78a;p=wimlib diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index 269f0a5b..28edf93f 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -2,24 +2,26 @@ * wimlib_internal.h * * Internal header for wimlib. - * - * wimlib - Library for working with WIM files - * + */ + +/* * Copyright (C) 2010 Carl Thijssen * Copyright (C) 2012 Eric Biggers * - * This library 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) any - * later version. + * 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) + * any later version. * - * This library 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 details. + * 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 + * details. * - * You should have received a copy of the GNU Lesser General Public License along - * with this library; if not, write to the Free Software Foundation, Inc., 59 - * Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU Lesser General Public License + * along with wimlib; if not, see http://www.gnu.org/licenses/. */ #ifndef _WIMLIB_INTERNAL_H @@ -181,10 +183,9 @@ struct wim_header { #define WIM_HDR_FLAG_COMPRESS_LZX 0x00040000 -#if 0 /* Structure for security data. Each image in the WIM file has its own security * data. */ -typedef struct WIMSecurityData { +struct wim_security_data { /* The total length of the security data, in bytes. A typical size is * 2048 bytes. If there is no security data, though (as in the WIMs * that wimlib writes, currently), it will be 8 bytes. */ @@ -198,49 +199,46 @@ typedef struct WIMSecurityData { /* Array of descriptors. */ u8 **descriptors; + + /* keep track of how many WIMs reference this security data (used when + * exporting images between WIMs) */ + u32 refcnt; } WIMSecurityData; -#endif /* Metadata resource for an image. */ struct image_metadata { + /* Pointer to the root dentry for the image. */ + struct dentry *root_dentry; -#if 0 - /* The security data for the image. */ - WIMSecurityData security_data; -#endif + /* Pointer to the security data for the image. */ + struct wim_security_data *security_data; - /* The root dentry for the image. */ - struct dentry *root_dentry; + /* A pointer to the lookup table entry for this image's metadata + * resource. */ + 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 * to a different WIM image. */ bool modified; - /* A pointer to the lookup table entry for this image's metadata - * resource. */ - struct lookup_table_entry *lookup_table_entry; }; /* The opaque structure exposed to the wimlib API. */ typedef struct WIMStruct { - /* The name of the WIM file that has been opened. */ - char *filename; /* A pointer to the file indicated by @filename, opened for reading. */ FILE *fp; - /* 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; + /* 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. */ struct lookup_table *lookup_table; - /* The header of the WIM file. */ - struct wim_header hdr; - /* Pointer to the XML data read from the WIM file. */ u8 *xml_data; @@ -252,22 +250,30 @@ typedef struct WIMStruct { * WIM has a image metadata associated with it. */ struct image_metadata *image_metadata; - /* True if files names are to be printed when doing extraction. - * May be used for other things later. */ - bool verbose; - - /* The type of links to create when extracting files (hard, symbolic, or - * none.) */ - int link_type; - /* Name of the output directory for extraction. */ char *output_dir; - /* Set to true when extracting multiple images */ - bool is_multi_image_extraction; + /* The header of the WIM file. */ + struct wim_header hdr; - /* FILE pointer for the WIM file that is being written. */ - FILE *out_fp; + /* Temporary flags to use when extracting a WIM image or adding a WIM + * image. */ + union { + int extract_flags; + int add_flags; + }; + + /* 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; + + union { + /* Set to true when extracting multiple images */ + bool is_multi_image_extraction; + + bool write_metadata; + }; } WIMStruct; @@ -283,17 +289,15 @@ static inline struct dentry **wim_root_dentry_p(WIMStruct *w) return &w->image_metadata[w->current_image - 1].root_dentry; } -#if 0 -static inline WIMSecurityData *wim_security_data(WIMStruct *w) +static inline struct wim_security_data *wim_security_data(WIMStruct *w) { - return &w->image_metadata[w->current_image - 1].security_data; + 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. */ @@ -307,11 +311,6 @@ 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; -} - /* Prints a hash code field. */ static inline void print_hash(const u8 hash[]) { @@ -353,32 +352,36 @@ 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, /* WIMSecurityData *sd, */ - struct dentry **root_dentry_p); +extern int read_metadata_resource(FILE *fp, int wim_ctype, + struct image_metadata *image_metadata); extern int resource_compression_type(int wim_ctype, int reshdr_flags); static inline int read_full_resource(FILE *fp, u64 resource_size, - u64 resource_original_size, - u64 resource_offset, - int resource_ctype, void *contents_ret) + 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); } -#if 0 +extern int write_file_resource(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); + /* security.c */ -bool read_security_data(const u8 metadata_resource[], - u64 metadata_resource_len, WIMSecurityData *sd); +int read_security_data(const u8 metadata_resource[], + u64 metadata_resource_len, struct wim_security_data **sd_p); -void print_security_data(const WIMSecurityData *sd); -u8 *write_security_data(const WIMSecurityData *sd, u8 *p); -void init_security_data(WIMSecurityData *sd); -void destroy_security_data(WIMSecurityData *sd); -#endif +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); /* wim.c */ extern WIMStruct *new_wim_struct(); @@ -391,13 +394,8 @@ 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); -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 begin_write(WIMStruct *w, const char *path, int flags); -extern int write_metadata_resource(WIMStruct *w); #include "wimlib.h"