write.c: Do not raw-copy packed resources

[wimlib] / include / wimlib / wim.h

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index 4afa60eb8594943ecc8ad06e4d8912384e51627b..2e780343408277613f7badaaeacfff7289f06eae 100644 (file)
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -42,8 +42,9 @@ struct WIMStruct {
        /* Temporary field */
        void *private;
 
-       /* LZX compression context for default thread  */
-       struct wimlib_lzx_context *lzx_context;
+       struct wimlib_decompressor *decompressor;
+       enum wimlib_compression_type decompressor_ctype;
+       u32 decompressor_max_block_size;
 
        struct list_head subwims;
 
@@ -69,13 +70,16 @@ struct WIMStruct {
        u8 guid_set_explicitly : 1;
 
        /* One of WIMLIB_COMPRESSION_TYPE_*, cached from the header flags. */
-       u8 compression_type : 2;
+       u8 compression_type;
 
-       /* Overwritten compression type for wimlib_overwrite() or
-        * wimlib_write().  Can be changed by
-        * wimlib_set_output_compression_type(); otherwise is the same as
-        * compression_type.  */
-       u8 out_compression_type : 2;
+       /* Overridden compression type for wimlib_overwrite() or wimlib_write().
+        * Can be changed by wimlib_set_output_compression_type(); otherwise is
+        * the same as compression_type.  */
+       u8 out_compression_type;
+
+       /* Compression type for writing packed streams; can be set with
+        * wimlib_set_output_pack_compression_type().  */
+       u8 out_pack_compression_type;
 
        /* Uncompressed size of compressed chunks in this WIM (cached from
         * header).  */
@@ -85,6 +89,10 @@ struct WIMStruct {
         * be changed by wimlib_set_output_chunk_size(); otherwise is the same
         * as chunk_size.  */
        u32 out_chunk_size;
+
+       /* Chunk size for writing packed streams; can be set with
+        * wimlib_set_output_pack_chunk_size().  */
+       u32 out_pack_chunk_size;
 };
 
 static inline bool wim_is_pipable(const WIMStruct *wim)
@@ -94,7 +102,7 @@ static inline bool wim_is_pipable(const WIMStruct *wim)
 
 static inline bool wim_has_integrity_table(const WIMStruct *wim)
 {
-       return (wim->hdr.integrity.offset != 0);
+       return (wim->hdr.integrity_table_reshdr.offset_in_wim != 0);
 }
 
 static inline bool wim_has_metadata(const WIMStruct *wim)
@@ -112,8 +120,7 @@ extern int
 init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size);
 
 extern int
-read_wim_header(const tchar *filename, struct filedes *in_fd,
-               struct wim_header *hdr);
+read_wim_header(WIMStruct *wim, struct wim_header *hdr);
 
 extern int
 write_wim_header(const struct wim_header *hdr, struct filedes *out_fd);