Update XZ Utils to 5.0.5

src/xz/coder.c

 ///////////////////////////////////////////////////////////////////////////////
 //
 /// \file       coder.c
 /// \brief      Compresses or uncompresses a file
 //
 //  Author:     Lasse Collin
 //
 //  This file has been put into the public domain.
 //  You can do whatever you want with this file.
 //
@@ skipping 19 matching lines @@
 static lzma_stream strm = LZMA_STREAM_INIT;
 
 /// Filters needed for all encoding all formats, and also decoding in raw data
 static lzma_filter filters[LZMA_FILTERS_MAX + 1];
 
 /// Input and output buffers
 static io_buf in_buf;
 static io_buf out_buf;
 
 /// Number of filters. Zero indicates that we are using a preset.
-static size_t filters_count = 0;
+static uint32_t filters_count = 0;
 
 /// Number of the preset (0-9)
-static size_t preset_number = 6;
-
-/// If a preset is used (no custom filter chain) and preset_extreme is true,
-/// a significantly slower compression is used to achieve slightly better
-/// compression ratio.
-static bool preset_extreme = false;
+static uint32_t preset_number = LZMA_PRESET_DEFAULT;
 
 /// Integrity check type
 static lzma_check check;
 
 /// This becomes false if the --check=CHECK option is used.
 static bool check_default = true;
 
 
 extern void
 coder_set_check(lzma_check new_check)
 {
         check = new_check;
         check_default = false;
         return;
 }
 
 
-extern void
-coder_set_preset(size_t new_preset)
+static void
+forget_filter_chain(void)
 {
-        preset_number = new_preset;
-
         // Setting a preset makes us forget a possibly defined custom
         // filter chain.
         while (filters_count > 0) {
                 --filters_count;
                 free(filters[filters_count].options);
                 filters[filters_count].options = NULL;
         }
 
         return;
 }
 
 
 extern void
+coder_set_preset(uint32_t new_preset)
+{
+        preset_number &= ~LZMA_PRESET_LEVEL_MASK;
+        preset_number |= new_preset;
+        forget_filter_chain();
+        return;
+}
+
+
+extern void
 coder_set_extreme(void)
 {
-        preset_extreme = true;
+        preset_number |= LZMA_PRESET_EXTREME;
+        forget_filter_chain();
         return;
 }
 
 
 extern void
 coder_add_filter(lzma_vli id, void *options)
 {
         if (filters_count == LZMA_FILTERS_MAX)
                 message_fatal(_("Maximum number of filters is four"));
 
         filters[filters_count].id = id;
         filters[filters_count].options = options;
         ++filters_count;
 
+        // Setting a custom filter chain makes us forget the preset options.
+        // This makes a difference if one specifies e.g. "xz -9 --lzma2 -e"
+        // where the custom filter chain resets the preset level back to
+        // the default 6, making the example equivalent to "xz -6e".
+        preset_number = LZMA_PRESET_DEFAULT;
+
         return;
 }
 
 
 static void lzma_attribute((__noreturn__))
 memlimit_too_small(uint64_t memory_usage)
 {
         message(V_ERROR, _("Memory usage limit is too low for the given "
                         "filter setup."));
         message_mem_needed(V_ERROR, memory_usage);
@@ skipping 16 matching lines @@
                         // The message is shown only if warnings are allowed
                         // but the exit status isn't changed.
                         message(V_WARNING, _("Using a preset in raw mode "
                                         "is discouraged."));
                         message(V_WARNING, _("The exact options of the "
                                         "presets may vary between software "
                                         "versions."));
                 }
 
                 // Get the preset for LZMA1 or LZMA2.
-                if (preset_extreme)
-                        preset_number |= LZMA_PRESET_EXTREME;
-
                 if (lzma_lzma_preset(&opt_lzma, preset_number))
                         message_bug();
 
                 // Use LZMA2 except with --format=lzma we use LZMA1.
                 filters[0].id = opt_format == FORMAT_LZMA
                                 ? LZMA_FILTER_LZMA1 : LZMA_FILTER_LZMA2;
                 filters[0].options = &opt_lzma;
                 filters_count = 1;
         }
 
@@ skipping 507 matching lines @@
                         }
                 }
         }
 
         // Close the file pair. It needs to know if coding was successful to
         // know if the source or target file should be unlinked.
         io_close(pair, success);
 
         return;
 }