X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=5e390efe1364d7b3afb55ecd371a0c1fd9f39170;hp=f07935c1f91ecfe3751da82985c281bbd390ebaf;hb=5c0d30fbd73ee5e9f080d0763ec08eb68fe69314;hpb=7ce0d372fae285051cbc9740c9fa316d22465d9d diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index f07935c1..5e390efe 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 */ @@ -268,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. */ @@ -278,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; @@ -294,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; @@ -310,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. */ @@ -363,46 +361,45 @@ resource_is_compressed(const struct resource_entry *entry) return (entry->flags & WIM_RESHDR_FLAG_COMPRESSED); } +/* 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) +/* 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) +/* 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) #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) { - memcpy(dst, src, sizeof(struct resource_entry)); 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]; } + +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 */ -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 */ - /* 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 * capturing a WIM image). */ @@ -426,6 +423,52 @@ struct wim_inode_table { 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); @@ -497,6 +540,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; @@ -508,16 +553,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 }; }; @@ -532,7 +582,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 @@ -544,20 +593,18 @@ 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_THREADSAFE_READ 0x2 #define WIMLIB_RESOURCE_FLAG_RECOMPRESS 0x4 -//#define WIMLIB_RESOURCE_FLAG_OVERWRITE_INPLACE 0x8 extern int read_resource_prefix(const struct wim_lookup_table_entry *lte, @@ -627,6 +674,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 */ @@ -675,8 +724,7 @@ wim_checksum_unhashed_streams(WIMStruct *w); #define WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE 0x80000000 #define WIMLIB_WRITE_FLAG_REUSE_INTEGRITY_TABLE 0x40000000 #define WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML 0x20000000 -//#define WIMLIB_WRITE_FLAG_OVERWRITE_INPLACE 0x10000000 -#define WIMLIB_WRITE_MASK_PUBLIC 0x0fffffff +#define WIMLIB_WRITE_MASK_PUBLIC 0x1fffffff /* We are capturing a tree to be placed in the root of the WIM image */ #define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000 @@ -685,7 +733,6 @@ wim_checksum_unhashed_streams(WIMStruct *w); * the WIM image */ #define WIMLIB_ADD_IMAGE_FLAG_SOURCE 0x40000000 - extern int begin_write(WIMStruct *w, const tchar *path, int write_flags);