wimoptimize: Add --recompress-slow, imply --recompress

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index 5af55ebd962e64016030e34dc290aca04cbbbf2e..679032569bae68a04feeaa0cb538f120520b42f8 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -284,6 +284,7 @@ static const struct option optimize_options[] = {
        {T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
        {T("recompress"),  no_argument,       NULL, IMAGEX_RECOMPRESS_OPTION},
        {T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
+       {T("recompress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
        {T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
        {T("pipable"),     no_argument,       NULL, IMAGEX_PIPABLE_OPTION},
        {T("not-pipable"), no_argument,       NULL, IMAGEX_NOT_PIPABLE_OPTION},
@@ -429,7 +430,6 @@ set_compress_slow(void)
                                .use_len2_matches = 1,
                                .num_fast_bytes = 96,
                                .num_optim_passes = 4,
-                               .num_split_passes = 0,
                                .max_search_depth = 100,
                                .max_matches_per_pos = 10,
                                .main_nostat_cost = 15,
@@ -3260,6 +3260,7 @@ imagex_optimize(int argc, tchar **argv, int cmd)
                        write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
                        break;
                case IMAGEX_COMPRESS_SLOW_OPTION:
+                       write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
                        set_compress_slow();
                        break;
                case IMAGEX_THREADS_OPTION:
@@ -3753,7 +3754,8 @@ T(
 [CMD_OPTIMIZE] =
 T(
 "    %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n"
-"                    [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n"
+"                    [--recompress-slow] [--threads=NUM_THREADS] [--pipable]\n"
+"                    [--not-pipable]\n"
 ),
 [CMD_SPLIT] =
 T(