#include <pthread.h>
#endif
+#define WIMLIB_MAKEVERSION(major, minor, patch) \
+ ((major << 20) | (minor << 10) | patch)
+
+
+#define WIMLIB_VERSION_CODE \
+ WIMLIB_MAKEVERSION(WIMLIB_MAJOR_VERSION,\
+ WIMLIB_MINOR_VERSION,\
+ WIMLIB_PATCH_VERSION)
+
+#define WIMLIB_GET_PATCH_VERSION(version) \
+ ((version >> 0) & ((1 << 10) - 1))
+#define WIMLIB_GET_MINOR_VERSION(version) \
+ ((version >> 10) & ((1 << 10) - 1))
+#define WIMLIB_GET_MAJOR_VERSION(version) \
+ ((version >> 20) & ((1 << 10) - 1))
+
+
struct stat;
-struct dentry;
-struct inode;
+struct wim_dentry;
+struct wim_inode;
#define WIM_MAGIC_LEN 8
#define WIM_GID_LEN 16
u32 refcnt;
};
-struct inode_table;
+struct wim_inode_table;
/* Metadata resource for an image. */
struct image_metadata {
/* Pointer to the root dentry for the image. */
- struct dentry *root_dentry;
+ struct wim_dentry *root_dentry;
/* Pointer to the security data for the image. */
struct wim_security_data *security_data;
/* A pointer to the lookup table entry for this image's metadata
* resource. */
- struct lookup_table_entry *metadata_lte;
+ struct wim_lookup_table_entry *metadata_lte;
/* Linked list of inodes for this image. */
struct hlist_head inode_list;
char *filename;
/* The lookup table for the WIM file. */
- struct lookup_table *lookup_table;
+ struct wim_lookup_table *lookup_table;
/* Pointer to the XML data read from the WIM file. */
u8 *xml_data;
u8 deletion_occurred : 1;
u8 all_images_verified : 1;
u8 full_verification_in_progress : 1;
+ u8 wim_locked : 1;
};
/* Inline utility functions for WIMStructs. */
-static inline struct dentry *wim_root_dentry(WIMStruct *w)
+static inline struct wim_dentry *wim_root_dentry(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 image_metadata *
+wim_get_current_image_metadata(WIMStruct *w)
+{
+ return &w->image_metadata[w->current_image - 1];
+}
+
/* Nonzero if a struct resource_entry indicates a compressed resource. */
static inline int resource_is_compressed(const struct resource_entry *entry)
{
extern bool exclude_path(const char *path,
const struct capture_config *config,
bool exclude_prefix);
-extern int add_new_dentry_tree(WIMStruct *dest_wim, struct dentry *root,
+extern int add_new_dentry_tree(WIMStruct *dest_wim, struct wim_dentry *root,
struct wim_security_data *sd);
/* extract_image.c */
/* hardlink.c */
-/* 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;
-};
-
-extern int init_inode_table(struct inode_table *table, size_t capacity);
-static inline void destroy_inode_table(struct inode_table *table)
-{
- FREE(table->array);
-}
-extern int inode_table_insert(struct dentry *dentry, void *__table);
extern u64 assign_inode_numbers(struct hlist_head *inode_list);
-extern int fix_inodes(struct inode_table *table, struct hlist_head *inode_list);
+
+extern int dentry_tree_fix_inodes(struct wim_dentry *root,
+ struct hlist_head *inode_list);
/* header.c */
extern int read_header(FILE *fp, struct wim_header *hdr, int split_ok);
extern int new_joined_lookup_table(WIMStruct *w,
WIMStruct **additional_swms,
unsigned num_additional_swms,
- struct lookup_table **table_ret);
+ struct wim_lookup_table **table_ret);
+
+/* metadata_resource.c */
+
+extern int read_metadata_resource(WIMStruct *w,
+ struct image_metadata *image_metadata);
+extern int write_metadata_resource(WIMStruct *w);
/* ntfs-apply.c */
#endif
struct list_head empty_files;
wimlib_progress_func_t progress_func;
+ int (*apply_dentry)(struct wim_dentry *, void *);
};
-extern int apply_dentry_ntfs(struct dentry *dentry, void *arg);
-extern int apply_dentry_timestamps_ntfs(struct dentry *dentry, void *arg);
+extern int apply_dentry_ntfs(struct wim_dentry *dentry, void *arg);
+extern int apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg);
/* ntfs-capture.c */
-extern int build_dentry_tree_ntfs(struct dentry **root_p,
+extern int build_dentry_tree_ntfs(struct wim_dentry **root_p,
const char *device,
- struct lookup_table *lookup_table,
+ struct wim_lookup_table *lookup_table,
struct wim_security_data *sd,
const struct capture_config *config,
int add_image_flags,
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[],
+extern int read_wim_resource(const struct wim_lookup_table_entry *lte, u8 buf[],
size_t size, u64 offset, int flags);
-extern int read_full_wim_resource(const struct lookup_table_entry *lte,
+extern int read_full_wim_resource(const struct wim_lookup_table_entry *lte,
u8 buf[], int flags);
-extern int write_wim_resource(struct lookup_table_entry *lte,
+extern int write_wim_resource(struct wim_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);
+typedef int (*extract_chunk_func_t)(const u8 *, size_t, u64, void *);
-extern int extract_full_wim_resource_to_fd(const struct lookup_table_entry *lte,
- int fd);
+extern int extract_wim_chunk_to_fd(const u8 *buf, size_t len,
+ u64 offset, void *arg);
-extern int read_metadata_resource(WIMStruct *w,
- struct image_metadata *image_metadata);
+extern int extract_wim_resource(const struct wim_lookup_table_entry *lte,
+ u64 size, extract_chunk_func_t extract_chunk,
+ void *extract_chunk_arg);
+/*
+ * Extracts the first @size bytes of the WIM resource specified by @lte to the
+ * open file descriptor @fd.
+ *
+ * Returns 0 on success; nonzero on failure.
+ */
+static inline int
+extract_wim_resource_to_fd(const struct wim_lookup_table_entry *lte,
+ int fd, u64 size)
+{
+ return extract_wim_resource(lte, size,
+ extract_wim_chunk_to_fd, &fd);
+}
-extern int write_dentry_resources(struct dentry *dentry, void *wim_p);
-extern int copy_resource(struct lookup_table_entry *lte, void *w);
-extern int write_metadata_resource(WIMStruct *w);
+extern int write_dentry_resources(struct wim_dentry *dentry, void *wim_p);
+extern int copy_resource(struct wim_lookup_table_entry *lte, void *w);
/* security.c */
extern 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,
+ssize_t inode_readlink(const struct wim_inode *inode, char *buf, size_t buf_len,
const WIMStruct *w, int read_resource_flags);
-extern int inode_set_symlink(struct inode *inode,
+extern int inode_set_symlink(struct wim_inode *inode,
const char *target,
- struct lookup_table *lookup_table,
- struct lookup_table_entry **lte_ret);
+ struct wim_lookup_table *lookup_table,
+ struct wim_lookup_table_entry **lte_ret);
/* verify.c */
-extern int verify_dentry(struct dentry *dentry, void *wim);
+extern int verify_dentry(struct wim_dentry *dentry, void *wim);
extern int wim_run_full_verifications(WIMStruct *w);
extern int verify_swm_set(WIMStruct *w,
WIMStruct **additional_swms,
extern int select_wim_image(WIMStruct *w, int image);
extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *));
extern void destroy_image_metadata(struct image_metadata *imd,
- struct lookup_table *lt);
+ struct wim_lookup_table *lt);
/* write.c */
wimlib_progress_func_t progress_func);
#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
-extern int lock_wim(FILE *fp, const char *path);
+extern int lock_wim(WIMStruct *w, FILE *fp);
#else
-static inline int lock_wim(FILE *fp, const char *path)
+static inline int lock_wim(WIMStruct *w, FILE *fp)
{
return 0;
}
git://wimlib.net / wimlib / blobdiff