wimoptimize: Add --pack-streams option

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index c0825687f7f3f38ab4141090dce344f1e5fc1715..97e156ddd40d23616a9bfca2e59cd4dd8961bdb7 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -138,6 +138,9 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
                 * 2^15 = 32768 is the default value used for compatibility, but
                 * wimlib can actually use up to 2^26.  */
                return order >= 15 && order <= 26;
+
+       case WIMLIB_COMPRESSION_TYPE_LZMS:
+               return order >= 15 && order <= 26;
        }
        return false;
 }
@@ -148,7 +151,12 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
 static u32
 wim_default_chunk_size(int ctype)
 {
-       return 32768;
+       switch (ctype) {
+       case WIMLIB_COMPRESSION_TYPE_LZMS:
+               return 131072;
+       default:
+               return 32768;
+       }
 }
 
 /*
@@ -293,6 +301,8 @@ wimlib_get_compression_type_string(int ctype)
                        return T("LZX");
                case WIMLIB_COMPRESSION_TYPE_XPRESS:
                        return T("XPRESS");
+               case WIMLIB_COMPRESSION_TYPE_LZMS:
+                       return T("LZMS");
                default:
                        return T("Invalid");
        }
@@ -371,7 +381,7 @@ wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info)
        memcpy(info->guid, wim->hdr.guid, WIMLIB_GUID_LEN);
        info->image_count = wim->hdr.image_count;
        info->boot_index = wim->hdr.boot_idx;
-       info->wim_version = WIM_VERSION;
+       info->wim_version = wim->hdr.wim_version;
        info->chunk_size = wim->hdr.chunk_size;
        info->part_number = wim->hdr.part_number;
        info->total_parts = wim->hdr.total_parts;
@@ -445,6 +455,7 @@ wimlib_set_output_compression_type(WIMStruct *wim, int ctype)
        case WIMLIB_COMPRESSION_TYPE_NONE:
        case WIMLIB_COMPRESSION_TYPE_LZX:
        case WIMLIB_COMPRESSION_TYPE_XPRESS:
+       case WIMLIB_COMPRESSION_TYPE_LZMS:
                wim->out_compression_type = ctype;
 
                /* Reset the chunk size if it's no longer valid.  */
@@ -474,10 +485,16 @@ wimlib_set_output_chunk_size(WIMStruct *wim, uint32_t chunk_size)
                        ERROR("Valid chunk sizes for LZX are "
                              "32768, 65536, 131072, ..., 2097152.");
                        break;
+               case WIMLIB_COMPRESSION_TYPE_LZMS:
+                       ERROR("Valid chunk sizes for LZMS are "
+                             "32768, 65536, 131072, ..., 67108864.");
+                       break;
                }
                return WIMLIB_ERR_INVALID_CHUNK_SIZE;
        }
-       if (chunk_size != 32768) {
+       if (chunk_size != 32768 &&
+           wim->out_compression_type != WIMLIB_COMPRESSION_TYPE_LZMS)
+       {
                WARNING  ("Changing the compression chunk size to any value other than\n"
                "          the default of 32768 bytes eliminates compatibility with\n"
                "          Microsoft's software!");
@@ -535,7 +552,6 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
                wim->in_fd.is_pipe = 1;
        } else {
                wimfile = wim_filename_or_fd;
-               DEBUG("Reading the WIM file `%"TS"'", wimfile);
                ret = do_open_wim(wimfile, &wim->in_fd);
                if (ret)
                        return ret;
@@ -562,7 +578,7 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
                }
        }
 
-       ret = read_wim_header(wim->filename, &wim->in_fd, &wim->hdr);
+       ret = read_wim_header(wim, &wim->hdr);
        if (ret)
                return ret;
 
@@ -596,17 +612,14 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
        /* Check and cache the compression type */
        if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESSION) {
                if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZX) {
-                       if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
-                               ERROR("Multiple compression flags are set in \"%"TS"\"",
-                                     wimfile);
-                               return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
-                       }
                        wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
                } else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
                        wim->compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
+               } else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZMS) {
+                       wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
                } else {
                        ERROR("The compression flag is set on \"%"TS"\", but "
-                             "neither the XPRESS nor LZX flag is set",
+                             "a flag for a recognized format is not",
                              wimfile);
                        return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
                }
@@ -677,6 +690,11 @@ open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
        WIMStruct *wim;
        int ret;
 
+       if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE)
+               DEBUG("Opening pipable WIM from file descriptor %d.", *(const int*)wim_filename_or_fd);
+       else
+               DEBUG("Opening WIM file \"%"TS"\"", (const tchar*)wim_filename_or_fd);
+
        wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
 
        if (wim_ret == NULL)
@@ -692,6 +710,7 @@ open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
                return ret;
        }
 
+       DEBUG("Successfully opened WIM and created WIMStruct.");
        *wim_ret = wim;
        return 0;
 }
@@ -824,9 +843,12 @@ wim_checksum_unhashed_streams(WIMStruct *wim)
                struct wim_lookup_table_entry *lte, *tmp;
                struct wim_image_metadata *imd = wim->image_metadata[i];
                image_for_each_unhashed_stream_safe(lte, tmp, imd) {
-                       ret = hash_unhashed_stream(lte, wim->lookup_table, NULL);
+                       struct wim_lookup_table_entry *new_lte;
+                       ret = hash_unhashed_stream(lte, wim->lookup_table, &new_lte);
                        if (ret)
                                return ret;
+                       if (new_lte != lte)
+                               free_lookup_table_entry(lte);
                }
        }
        return 0;