X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=c2457b9ac51e254ce72fdff8f25e4b89a935c55f;hb=6461b7e0a98286fa4dca4ede22cdbd07c6240e5d;hp=7f2ee17809b4cba4ae670cf787022843e52efef2;hpb=fea0ee9f10fbcb85ff56ca06510e96186a7611ae;p=wimlib

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 7f2ee178..c2457b9a 100644
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -35,6 +35,23 @@
 #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;
@@ -300,6 +317,7 @@ struct WIMStruct {
 	u8 deletion_occurred : 1;
 	u8 all_images_verified : 1;
 	u8 full_verification_in_progress : 1;
+	u8 wim_locked : 1;
 };
 
 /* Inline utility functions for WIMStructs. */
@@ -320,6 +338,12 @@ wim_const_security_data(const WIMStruct *w)
 	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)
 {
@@ -358,36 +382,10 @@ extern int add_new_dentry_tree(WIMStruct *dest_wim, struct dentry *root,
 
 /* 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 dentry *root,
+				  struct hlist_head *inode_list);
 
 /* header.c */
 extern int read_header(FILE *fp, struct wim_header *hdr, int split_ok);
@@ -416,6 +414,12 @@ extern int new_joined_lookup_table(WIMStruct *w,
 			    	   unsigned num_additional_swms,
 				   struct 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 */
 
 struct apply_args {
@@ -467,20 +471,32 @@ extern int write_wim_resource(struct lookup_table_entry *lte,
 			      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 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 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);
 
 
 /* security.c */
@@ -528,9 +544,9 @@ extern int finish_write(WIMStruct *w, int image, int write_flags,
 			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;
 }