wimoptimize: Add --pack-streams option

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index a62be39e05709c8f8a66f30d3461b1ac8e39700c..97e156ddd40d23616a9bfca2e59cd4dd8961bdb7 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -140,8 +140,7 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
                return order >= 15 && order <= 26;
 
        case WIMLIB_COMPRESSION_TYPE_LZMS:
-               /* TODO */
-               return 131072;
+               return order >= 15 && order <= 26;
        }
        return false;
 }
@@ -152,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;
+       }
 }
 
 /*
@@ -297,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");
        }
@@ -449,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.  */
@@ -478,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!");
@@ -602,11 +615,8 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
                        wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
                } else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
                        wim->compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
-       #if 0
-               /* TODO */
                } else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZMS) {
                        wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
-       #endif
                } else {
                        ERROR("The compression flag is set on \"%"TS"\", but "
                              "a flag for a recognized format is not",
@@ -833,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;