jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Updated options.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2006-11-12 10:56:17 +01:00
parent 2f41ece017
commit 6e763b0b42
1 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+46 -30
View File
@@ -300,8 +300,14 @@ static bool set_method(int m, int l)
{ {
if (!Packer::isValidCompressionMethod(m)) if (!Packer::isValidCompressionMethod(m))
return false; return false;
opt->method = m; #if 1
opt->all_methods = false; // something like "--brute --lzma" should not disable "--brute"
if (!opt->all_methods)
#endif
{
opt->method = m;
opt->all_methods = false;
}
} }
if (l > 0) if (l > 0)
opt->level = l; opt->level = l;
@@ -536,6 +542,11 @@ static int do_option(int optc, const char *arg)
if (!set_method(M_LZMA, -1)) if (!set_method(M_LZMA, -1))
e_method(M_LZMA, opt->level); e_method(M_LZMA, opt->level);
break; break;
case 722:
opt->all_methods_use_lzma = false;
if (opt->method == M_LZMA)
opt->method = -1;
break;
// compression level // compression level
case '1': case '1':
@@ -852,16 +863,16 @@ static const struct mfx_option longopts[] =
{"fake-stub-year" ,0x31, 0, 543}, // for internal debugging {"fake-stub-year" ,0x31, 0, 543}, // for internal debugging
// backup options // backup options
{"backup", 0, 0, 'k'}, {"backup", 0x10, 0, 'k'},
{"keep", 0, 0, 'k'}, {"keep", 0x10, 0, 'k'},
{"no-backup", 0, 0, 541}, {"no-backup", 0x10, 0, 541},
// overlay options // overlay options
{"overlay", 0x31, 0, 551}, // --overlay= {"overlay", 0x31, 0, 551}, // --overlay=
{"skip-overlay", 0, 0, 552}, {"skip-overlay", 0x10, 0, 552},
{"no-overlay", 0, 0, 552}, // old name {"no-overlay", 0x10, 0, 552}, // old name
{"copy-overlay", 0, 0, 553}, {"copy-overlay", 0x10, 0, 553},
{"strip-overlay", 0, 0, 554}, {"strip-overlay", 0x10, 0, 554},
// CPU options // CPU options
{"cpu", 0x31, 0, 560}, // --cpu= {"cpu", 0x31, 0, 560}, // --cpu=
@@ -870,15 +881,16 @@ static const struct mfx_option longopts[] =
{"486", 0x10, 0, 564}, {"486", 0x10, 0, 564},
// color options // color options
{"no-color", 0, 0, 512}, {"no-color", 0x10, 0, 512},
{"mono", 0, 0, 513}, {"mono", 0x10, 0, 513},
{"color", 0, 0, 514}, {"color", 0x10, 0, 514},
// compression method // compression method
{"nrv2b", 0x10, 0, 702}, // --nrv2b {"nrv2b", 0x10, 0, 702}, // --nrv2b
{"nrv2d", 0x10, 0, 704}, // --nrv2d {"nrv2d", 0x10, 0, 704}, // --nrv2d
{"nrv2e", 0x10, 0, 705}, // --nrv2e {"nrv2e", 0x10, 0, 705}, // --nrv2e
{"lzma", 0x10, 0, 721}, // --lzma {"lzma", 0x10, 0, 721}, // --lzma
{"no-lzma", 0x10, 0, 722}, // (disable all_methods_use_lzma)
// compression settings // compression settings
{"all-filters", 0x10, 0, 523}, {"all-filters", 0x10, 0, 523},
{"all-methods", 0x10, 0, 524}, {"all-methods", 0x10, 0, 524},
@@ -910,7 +922,7 @@ static const struct mfx_option longopts[] =
// atari/tos // atari/tos
{"split-segments", 0x10, 0, 650}, {"split-segments", 0x10, 0, 650},
// djgpp2/coff // djgpp2/coff
{"coff", 0, 0, 610}, // produce COFF output {"coff", 0x10, 0, 610}, // produce COFF output
// dos/com // dos/com
// dos/exe // dos/exe
//{"force-stub", 0x10, 0, 600}, //{"force-stub", 0x10, 0, 600},
@@ -922,15 +934,19 @@ static const struct mfx_option longopts[] =
#if 0 #if 0
{"script", 0x31, 0, 662}, // --script= {"script", 0x31, 0, 662}, // --script=
#endif #endif
{"is_ptinterp", 0, 0, 663}, // linux/elf386 PT_INTERP program {"is_ptinterp", 0x10, 0, 663}, // linux/elf386 PT_INTERP program
{"use_ptinterp", 0, 0, 664}, // linux/elf386 PT_INTERP program {"use_ptinterp", 0x10, 0, 664}, // linux/elf386 PT_INTERP program
{"make_ptinterp", 0, 0, 665}, // linux/elf386 PT_INTERP program {"make_ptinterp", 0x10, 0, 665}, // linux/elf386 PT_INTERP program
{"Linux", 0, 0, 666}, {"Linux", 0x10, 0, 666},
{"FreeBSD", 0, 0, 667}, {"linux", 0x10, 0, 666},
{"NetBSD", 0, 0, 668}, {"FreeBSD", 0x10, 0, 667},
{"OpenBSD", 0, 0, 669}, {"freebsd", 0x10, 0, 667},
{"NetBSD", 0x10, 0, 668},
{"netbsd", 0x10, 0, 668},
{"OpenBSD", 0x10, 0, 669},
{"openbsd", 0x10, 0, 669},
// watcom/le // watcom/le
{"le", 0, 0, 620}, // produce LE output {"le", 0x10, 0, 620}, // produce LE output
// win32/pe // win32/pe
{"compress-exports", 2, 0, 630}, {"compress-exports", 2, 0, 630},
{"compress-icons", 2, 0, 631}, {"compress-icons", 2, 0, 631},
@@ -985,16 +1001,16 @@ static const struct mfx_option longopts[] =
{"verbose", 0, 0, 'v'}, // verbose mode {"verbose", 0, 0, 'v'}, // verbose mode
// backup options // backup options
{"backup", 0, 0, 'k'}, {"backup", 0x10, 0, 'k'},
{"keep", 0, 0, 'k'}, {"keep", 0x10, 0, 'k'},
{"no-backup", 0x10, 0, 541}, {"no-backup", 0x10, 0, 541},
// overlay options // overlay options
{"overlay", 0x31, 0, 551}, // --overlay= {"overlay", 0x31, 0, 551}, // --overlay=
{"skip-overlay", 0, 0, 552}, {"skip-overlay", 0x10, 0, 552},
{"no-overlay", 0, 0, 552}, // old name {"no-overlay", 0x10, 0, 552}, // old name
{"copy-overlay", 0, 0, 553}, {"copy-overlay", 0x10, 0, 553},
{"strip-overlay", 0, 0, 554}, {"strip-overlay", 0x10, 0, 554},
// CPU options // CPU options
{"cpu", 0x31, 0, 560}, // --cpu= {"cpu", 0x31, 0, 560}, // --cpu=
@@ -1003,9 +1019,9 @@ static const struct mfx_option longopts[] =
{"486", 0x10, 0, 564}, {"486", 0x10, 0, 564},
// color options // color options
{"no-color", 0, 0, 512}, {"no-color", 0x10, 0, 512},
{"mono", 0, 0, 513}, {"mono", 0x10, 0, 513},
{"color", 0, 0, 514}, {"color", 0x10, 0, 514},
// compression runtime parameters // compression runtime parameters