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 96136d8aadfb13dbe16e9c8c9820d2b248e76db7..49d1cbbc9751eb6c226a4fc764510963b795387b 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -55,11 +55,9 @@ struct inode;
  * yet.  The differences between the versions are undocumented. */
 #define WIM_VERSION 0x10d00
 
-enum wim_integrity_status {
-       WIM_INTEGRITY_OK,
-       WIM_INTEGRITY_NOT_OK,
-       WIM_INTEGRITY_NONEXISTENT,
-};
+#define WIM_INTEGRITY_OK 0
+#define WIM_INTEGRITY_NOT_OK -1
+#define WIM_INTEGRITY_NONEXISTENT -2
 
 /* Metadata for a resource in a WIM file. */
 struct resource_entry {
@@ -249,54 +247,53 @@ struct image_metadata {
        /* True if the filesystem of the image has been modified.  If this is
         * the case, the memory for the filesystem is not freed when switching
         * to a different WIM image. */
-       bool modified;
+       u8 modified : 1;
 
+       u8 has_been_mounted_rw : 1;
 };
 
 #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 {
 
        /* A pointer to the file indicated by @filename, opened for reading. */
-       FILE  *fp;
+       FILE *fp;
 
 #ifdef WITH_FUSE
+       /* Extra file pointers to be used by concurrent readers */
        FILE **fp_tab;
        size_t num_allocated_fps;
        pthread_mutex_t fp_tab_mutex;
 #endif
 
        /* FILE pointer for the WIM file that is being written. */
-       FILE  *out_fp;
+       FILE *out_fp;
 
        /* The name of the WIM file that has been opened. */
-       char  *filename;
+       char *filename;
 
        /* The lookup table for the WIM file. */
        struct lookup_table *lookup_table;
 
        /* Pointer to the XML data read from the WIM file. */
-       u8    *xml_data;
+       u8 *xml_data;
 
        /* Information retrieved from the XML data, arranged
         * in an orderly manner. */
-       struct wim_info      *wim_info;
+       struct wim_info *wim_info;
 
        /* Array of the image metadata of length image_count.  Each image in the
         * WIM has a image metadata associated with it. */
-       struct image_metadata     *image_metadata;
+       struct image_metadata *image_metadata;
 
        /* The header of the WIM file. */
-       struct wim_header    hdr;
+       struct wim_header hdr;
 
-       /* Temporary flags to use when extracting a WIM image or adding a WIM
-        * image. */
+       /* Temporary fields */
        union {
-               int extract_flags;
-               int add_flags;
-               int write_flags;
                bool write_metadata;
                void *private;
        };
@@ -309,6 +306,7 @@ typedef struct WIMStruct {
         * image_metadata array. */
        int current_image;
 
+       /* %true iff any images have been deleted from this WIM. */
        bool deletion_occurred;
 } WIMStruct;
 
@@ -405,10 +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);
-extern int check_wim_integrity(WIMStruct *w, int show_progress, int *status);
+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 */
 
@@ -487,14 +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,
+                            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);