X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=1dfc43674cf3679bbfd569dfcf6827ee3a397586;hb=ff556d243953bd6df1399466c452f327feae2ed9;hp=18f027387136009dfd737937372a711f3728eb52;hpb=13c6ce3160fce7c40008d1d182325c8b42450d1e;p=wimlib diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index 18f02738..1dfc4367 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -31,7 +31,7 @@ #include "list.h" #include "wimlib.h" -#ifdef WITH_FUSE +#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION) #include #endif @@ -72,6 +72,8 @@ struct sd_set; * yet. The differences between the versions are undocumented. */ #define WIM_VERSION 0x10d00 +#define REPARSE_POINT_MAX_SIZE (16 * 1024) + /* Metadata for a resource in a WIM file. */ struct resource_entry { /* Size, in bytes, of the resource in the WIM file. */ @@ -195,9 +197,11 @@ struct wim_header { * file (if supported by the underlying filesystem). */ #define WIM_HDR_FLAG_WRITE_IN_PROGRESS 0x00000040 -/* Reparse point fixup ??? - * This has something to do with absolute targets of reparse points / symbolic - * links but I don't know what. wimlib ignores this flag. */ +/* Reparse point fixup flag. See docs for --rpfix and --norpfix in imagex, or + * WIMLIB_ADD_IMAGE_FLAG_{RPFIX,NORPFIX} in wimlib.h. Note that + * WIM_HDR_FLAG_RP_FIX is a header flag and just sets the default behavior for + * the WIM; it can still be overridder on a per-image basis. But there is no + * flag to set the default behavior for a specific image. */ #define WIM_HDR_FLAG_RP_FIX 0x00000080 /* Unused, reserved flag for another compression type */ @@ -239,10 +243,12 @@ struct wim_security_data { /* Metadata for a WIM image */ struct wim_image_metadata { + /* Number of WIMStruct's that are sharing this image metadata (from + * calls to wimlib_export_image().) */ unsigned long refcnt; /* Pointer to the root dentry of the image. */ - struct wim_dentry *root_dentry; + struct wim_dentry *root_dentry; /* Pointer to the security data of the image. */ struct wim_security_data *security_data; @@ -251,9 +257,14 @@ struct wim_image_metadata { */ struct wim_lookup_table_entry *metadata_lte; - /* Linked list of inodes of this image */ - struct hlist_head inode_list; + /* Linked list of 'struct wim_inode's for this image. */ + struct list_head inode_list; + /* Linked list of 'struct wim_lookup_table_entry's for this image that + * are referred to in the dentry tree, but have not had a SHA1 message + * digest calculated yet and therefore have not been inserted into the + * WIM's lookup table. This list is added to during wimlib_add_image() + * and wimlib_mount_image() (read-write only). */ struct list_head unhashed_streams; /* 1 iff the dentry tree has been modified. If this is the case, the @@ -261,8 +272,9 @@ struct wim_image_metadata { * different WIM image. */ u8 modified : 1; - /* 1 iff this image has been mounted read-write */ - u8 has_been_mounted_rw : 1; +#ifdef WITH_NTFS_3G + struct _ntfs_volume *ntfs_vol; +#endif }; /* The opaque structure exposed to the wimlib API. */ @@ -271,7 +283,7 @@ struct WIMStruct { /* A pointer to the file indicated by @filename, opened for reading. */ FILE *fp; -#ifdef WITH_FUSE +#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION) /* Extra file pointers to be used by concurrent readers */ FILE **fp_tab; size_t num_allocated_fps; @@ -287,9 +299,6 @@ struct WIMStruct { /* The lookup table for the WIM file. */ struct wim_lookup_table *lookup_table; - /* Pointer to the XML data read from the WIM file (UTF16LE-encoded). */ - utf16lechar *xml_data; - /* Information retrieved from the XML data, arranged in an orderly * manner. */ struct wim_info *wim_info; @@ -303,10 +312,6 @@ struct WIMStruct { /* Temporary field */ void *private; -#ifdef WITH_NTFS_3G - struct _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. */ @@ -356,21 +361,44 @@ resource_is_compressed(const struct resource_entry *entry) return (entry->flags & WIM_RESHDR_FLAG_COMPRESSED); } -/* add_image.c */ +/* Iterate over each inode in a WIM image that has not yet been hashed */ +#define image_for_each_inode(inode, imd) \ + list_for_each_entry(inode, &imd->inode_list, i_list) -extern bool -exclude_path(const tchar *path, size_t path_len, - const struct wimlib_capture_config *config, - bool exclude_prefix); +/* Iterate over each stream in a WIM image that has not yet been hashed */ +#define image_for_each_unhashed_stream(lte, imd) \ + list_for_each_entry(lte, &imd->unhashed_streams, unhashed_list) -/* extract_image.c */ +/* Iterate over each stream in a WIM image that has not yet been hashed (safe + * against stream removal) */ +#define image_for_each_unhashed_stream_safe(lte, tmp, imd) \ + list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list) -/* Internal use only */ -#define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000 -#define WIMLIB_EXTRACT_FLAG_NO_STREAMS 0x40000000 -#define WIMLIB_EXTRACT_MASK_PUBLIC 0x3fffffff +#if 1 +# define copy_resource_entry(dst, src) memcpy(dst, src, sizeof(struct resource_entry)) +# define zero_resource_entry(entry) memset(entry, 0, sizeof(struct resource_entry)) +#else +static inline void +copy_resource_entry(struct resource_entry *dst, + const struct resource_entry *src) +{ + BUILD_BUG_ON(sizeof(struct resource_entry) != 24); + ((u64*)dst)[0] = ((u64*)src)[0]; + ((u64*)dst)[1] = ((u64*)src)[1]; + ((u64*)dst)[2] = ((u64*)src)[2]; +} -/* hardlink.c */ +static inline void +zero_resource_entry(struct resource_entry *entry) +{ + BUILD_BUG_ON(sizeof(struct resource_entry) != 24); + ((u64*)entry)[0] = 0; + ((u64*)entry)[1] = 0; + ((u64*)entry)[2] = 0; +} +#endif + +/* add_image.c */ /* Hash table to find inodes, given an inode number (in the case of reading * a WIM images), or both an inode number and a device number (in the case of @@ -392,19 +420,69 @@ struct wim_inode_table { * number with some other inode until assign_inode_numbers() is * called. */ - struct hlist_head extra_inodes; + struct list_head extra_inodes; +}; + +/* Common parameters to implementations of building an in-memory dentry tree + * from an on-disk directory structure. */ +struct add_image_params { + /* Pointer to the lookup table of the WIM. */ + struct wim_lookup_table *lookup_table; + + /* Pointer to a hash table of inodes that have been captured for this + * WIM image so far. */ + struct wim_inode_table *inode_table; + + /* Pointer to the set of security descriptors that have been captured + * for this image so far. */ + struct sd_set *sd_set; + + /* Pointer to the capture configuration, which indicates whether any + * files should be excluded from capture or not. */ + const struct wimlib_capture_config *config; + + /* Flags that affect the capture operation (WIMLIB_ADD_IMAGE_FLAG_*) */ + int add_image_flags; + + /* If non-NULL, the user-supplied progress function. */ + wimlib_progress_func_t progress_func; + + /* Extra argument; set to point to a pointer to the ntfs_volume for + * libntfs-3g capture. */ + void *extra_arg; + + u64 capture_root_ino; + u64 capture_root_dev; }; +extern bool +exclude_path(const tchar *path, size_t path_len, + const struct wimlib_capture_config *config, + bool exclude_prefix); + +/* extract_image.c */ + +/* Internal use only */ +#define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000 +#define WIMLIB_EXTRACT_FLAG_NO_STREAMS 0x40000000 +#define WIMLIB_EXTRACT_MASK_PUBLIC 0x3fffffff + +/* hardlink.c */ + extern int init_inode_table(struct wim_inode_table *table, size_t capacity); extern int inode_table_new_dentry(struct wim_inode_table *table, const tchar *name, - u64 ino, u64 devno, struct wim_dentry **dentry_ret); + u64 ino, u64 devno, bool noshare, + struct wim_dentry **dentry_ret); + +extern void +inode_ref_streams(struct wim_inode *inode); extern void inode_table_prepare_inode_list(struct wim_inode_table *table, - struct hlist_head *head); + struct list_head *head); static inline void destroy_inode_table(struct wim_inode_table *table) @@ -414,7 +492,7 @@ destroy_inode_table(struct wim_inode_table *table) extern int -dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list); +dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list); /* header.c */ @@ -463,6 +541,8 @@ write_metadata_resource(WIMStruct *w); struct apply_args { WIMStruct *w; const tchar *target; + tchar *target_realpath; + unsigned target_realpath_len; int extract_flags; union wimlib_progress_info progress; wimlib_progress_func_t progress_func; @@ -474,16 +554,21 @@ struct apply_args { struct _ntfs_volume *vol; }; #endif - struct { - /* Normal apply only (UNIX) */ - unsigned long num_utime_warnings; - }; - + #ifdef __WIN32__ struct { /* Normal apply only (Win32) */ unsigned long num_set_sacl_priv_notheld; unsigned long num_set_sd_access_denied; + unsigned vol_flags; + unsigned long num_hard_links_failed; + bool have_vol_flags; }; + #else + struct { + /* Normal apply only (UNIX) */ + unsigned long num_utime_warnings; + }; + #endif }; }; @@ -498,7 +583,6 @@ libntfs3g_global_init(); /* ntfs-capture.c */ -/* The types of these two callbacks are intentionally the same. */ typedef int (*consume_data_callback_t)(const void *buf, size_t len, void *ctx); extern int @@ -510,18 +594,17 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, extern int build_dentry_tree_ntfs(struct wim_dentry **root_p, const tchar *device, - struct wim_lookup_table *lookup_table, - struct wim_inode_table *inode_table, - struct sd_set *sd_set, - const struct wimlib_capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - void *extra_arg); + struct add_image_params *ctx); + +#ifdef WITH_NTFS_3G +extern int +do_ntfs_umount(struct _ntfs_volume *vol); +#endif /* resource.c */ #define WIMLIB_RESOURCE_FLAG_RAW 0x1 -#define WIMLIB_RESOURCE_FLAG_MULTITHREADED 0x2 +#define WIMLIB_RESOURCE_FLAG_THREADSAFE_READ 0x2 #define WIMLIB_RESOURCE_FLAG_RECOMPRESS 0x4 extern int @@ -561,6 +644,9 @@ extern int extract_wim_resource_to_fd(const struct wim_lookup_table_entry *lte, int fd, u64 size); +extern int +sha1_resource(struct wim_lookup_table_entry *lte); + extern int copy_resource(struct wim_lookup_table_entry *lte, void *w); @@ -589,6 +675,8 @@ inode_set_symlink(struct wim_inode *inode, const char *target, struct wim_lookup_table *lookup_table, struct wim_lookup_table_entry **lte_ret); #endif +extern tchar * +fixup_symlink(tchar *dest, u64 capture_root_ino, u64 capture_root_dev); /* verify.c */ @@ -628,6 +716,9 @@ new_image_metadata(); extern struct wim_image_metadata ** new_image_metadata_array(unsigned num_images); +extern int +wim_checksum_unhashed_streams(WIMStruct *w); + /* write.c */ /* Internal use only */ @@ -643,7 +734,6 @@ new_image_metadata_array(unsigned num_images); * the WIM image */ #define WIMLIB_ADD_IMAGE_FLAG_SOURCE 0x40000000 - extern int begin_write(WIMStruct *w, const tchar *path, int write_flags);