Add independent LZMS decompressor

[wimlib] / src / write.c

diff --git a/src/write.c b/src/write.c
index 80a3b096ffaabef3032d78ce903e9fbdaff0bdd1..63c91b2aef5b683ef00120a9c1222b6a0279df40 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -74,9 +74,19 @@ static bool
 can_raw_copy(const struct wim_lookup_table_entry *lte,
             int write_resource_flags, int out_ctype, u32 out_chunk_size)
 {
-       return (out_ctype == lte_ctype(lte)
-               && out_chunk_size == lte_cchunk_size(lte)
-               && out_ctype != WIMLIB_COMPRESSION_TYPE_NONE);
+       if (lte->resource_location != RESOURCE_IN_WIM)
+               return false;
+       if (out_ctype == WIMLIB_COMPRESSION_TYPE_NONE)
+               return false;
+       if (lte->rspec->ctype != out_ctype)
+               return false;
+       if (out_chunk_size != lte->rspec->cchunk_size)
+               return false;
+       if (lte->offset_in_res != 0)
+               return false;
+       if (lte->size != lte->rspec->uncompressed_size)
+               return false;
+       return true;
 }
 
 
@@ -109,6 +119,11 @@ compress_chunk(const void * uncompressed_data,
                                            uncompressed_len,
                                            compressed_data,
                                            comp_ctx);
+       case WIMLIB_COMPRESSION_TYPE_LZMS:
+               /* TODO */
+               WARNING("LZMS compression not yet implemented!");
+               return 0;
+
        default:
                wimlib_assert(0);
                return 0;
@@ -253,7 +268,7 @@ write_pwm_stream_header(const struct wim_lookup_table_entry *lte,
                copy_hash(stream_hdr.hash, lte->hash);
        }
 
-       reshdr_flags = lte->flags & ~WIM_RESHDR_FLAG_COMPRESSED;
+       reshdr_flags = lte->flags & ~(WIM_RESHDR_FLAG_COMPRESSED | WIM_RESHDR_FLAG_CONCAT);
        reshdr_flags |= additional_reshdr_flags;
        stream_hdr.flags = cpu_to_le32(reshdr_flags);
        ret = full_write(out_fd, &stream_hdr, sizeof(stream_hdr));
@@ -516,9 +531,8 @@ try_write_again:
                in_chunk_size = lte_cchunk_size(lte);
        else
                in_chunk_size = out_chunk_size;
-       ret = read_resource_prefix(lte, read_size,
-                                  write_resource_cb,
-                                  in_chunk_size, &write_ctx, resource_flags);
+       ret = read_stream_prefix(lte, read_size, write_resource_cb,
+                                in_chunk_size, &write_ctx, resource_flags);
        if (ret)
                goto out_free_chunk_tab;
 
@@ -543,7 +557,7 @@ try_write_again:
        /* Fill in out_reshdr with information about the newly written
         * resource.  */
        out_reshdr->size_in_wim   = out_fd->offset - res_start_offset;
-       out_reshdr->flags         = lte->flags;
+       out_reshdr->flags         = lte->flags & ~WIM_RESHDR_FLAG_CONCAT;
        if (out_ctype == WIMLIB_COMPRESSION_TYPE_NONE)
                out_reshdr->flags &= ~WIM_RESHDR_FLAG_COMPRESSED;
        else
@@ -1466,9 +1480,8 @@ submit_stream_for_compression(struct wim_lookup_table_entry *lte,
        ctx->next_lte = lte;
        INIT_LIST_HEAD(&lte->msg_list);
        list_add_tail(&lte->being_compressed_list, &ctx->outstanding_streams);
-       ret = read_resource_prefix(lte, lte->size,
-                                  main_writer_thread_cb,
-                                  ctx->out_chunk_size, ctx, 0);
+       ret = read_stream_prefix(lte, lte->size, main_writer_thread_cb,
+                                ctx->out_chunk_size, ctx, 0);
        if (ret)
                return ret;
        wimlib_assert(ctx->next_chunk == ctx->next_num_chunks);