Fix sequential extraction, and include progress info

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 57c0db0556c7b555686180457c73c8f2c1c28d9a..49d1cbbc9751eb6c226a4fc764510963b795387b 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -254,6 +254,7 @@ struct image_metadata {
 
 #define WIMLIB_RESOURCE_FLAG_RAW               0x1
 #define WIMLIB_RESOURCE_FLAG_MULTITHREADED     0x2
+#define WIMLIB_RESOURCE_FLAG_RECOMPRESS                0x4
 
 /* The opaque structure exposed to the wimlib API. */
 typedef struct WIMStruct {
@@ -402,12 +403,12 @@ extern int write_header(const struct wim_header *hdr, FILE *out);
 extern int init_header(struct wim_header *hdr, int ctype);
 
 /* integrity.c */
-extern int write_integrity_table(FILE *out, u64 end_header_offset,
-                                u64 end_lookup_table_offset,
-                                int show_progress,
-                                struct resource_entry *out_res_entry);
-
-extern int check_wim_integrity(WIMStruct *w, int show_progress);
+extern int write_integrity_table(FILE *out,
+                                struct resource_entry *integrity_res_entry,
+                                off_t new_lookup_table_end,
+                                off_t old_lookup_table_end,
+                                bool show_progress);
+extern int check_wim_integrity(WIMStruct *w, bool show_progress);
 
 /* join.c */
 
@@ -486,16 +487,34 @@ extern int inode_set_symlink(struct inode *inode,
                             struct lookup_table *lookup_table,
                             struct lookup_table_entry **lte_ret);
 
+extern void show_stream_op_progress(u64 *cur_size, u64 *next_size,
+                                   u64 total_size, u64 one_percent,
+                                   unsigned *cur_percent,
+                                   const struct lookup_table_entry *cur_lte,
+                                   const char *op);
+
+extern void finish_stream_op_progress(u64 total_size, const char *op);
+
 /* wim.c */
 extern WIMStruct *new_wim_struct();
 extern int select_wim_image(WIMStruct *w, int image);
 extern int wim_hdr_flags_compression_type(int wim_hdr_flags);
 extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *));
 extern int open_wim_readable(WIMStruct *w, const char *path);
-extern int open_wim_writable(WIMStruct *w, const char *path);
+extern int open_wim_writable(WIMStruct *w, const char *path,
+                            bool trunc, bool readable);
 
 /* Internal use only */
-#define WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE 0x80000000
+#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_MASK_PUBLIC               0x1fffffff
+
+/* Internal use only */
+#define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE                0x80000000
+#define WIMLIB_EXTRACT_FLAG_NO_STREAMS         0x40000000
+#define WIMLIB_EXTRACT_MASK_PUBLIC             0x2fffffff
+
 
 /* write.c */
 extern int begin_write(WIMStruct *w, const char *path, int write_flags);