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

Added new option '--ultra-brute'.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2006-12-01 02:47:46 +01:00
parent 83052eafae
commit 1d0d538d0c
13 changed files with 76 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/packer.cpp
+11 -5
View File
@@ -163,7 +163,9 @@ bool Packer::testUnpackFormat(int format) const
bool ph_skipVerify(const PackHeader &ph)
{
if (ph.method == M_LZMA)
if (M_IS_DEFLATE(ph.method))
return false;
if (M_IS_LZMA(ph.method))
return false;
if (ph.level > 1)
return false;
@@ -1267,9 +1269,11 @@ void Packer::compressWithFilters(Filter *parm_ft,
int nmethods = 0;
for (int mm = 0; methods[mm] != M_END; ++mm)
{
if (methods[mm] == M_SKIP)
if (methods[mm] == M_ULTRA_BRUTE && !opt->ultra_brute)
break;
if (methods[mm] == M_SKIP || methods[mm] == M_ULTRA_BRUTE)
continue;
if (opt->all_methods && !opt->all_methods_use_lzma && methods[mm] == M_LZMA)
if (opt->all_methods && !opt->all_methods_use_lzma && M_IS_LZMA(methods[mm]))
continue;
assert(isValidCompressionMethod(methods[mm]));
nmethods++;
@@ -1290,9 +1294,11 @@ void Packer::compressWithFilters(Filter *parm_ft,
int nfilters_success = 0;
for (int mm = 0; methods[mm] != M_END; ++mm) // for all methods
{
if (methods[mm] == M_SKIP)
if (methods[mm] == M_ULTRA_BRUTE && !opt->ultra_brute)
break;
if (methods[mm] == M_SKIP || methods[mm] == M_ULTRA_BRUTE)
continue;
if (opt->all_methods && !opt->all_methods_use_lzma && methods[mm] == M_LZMA)
if (opt->all_methods && !opt->all_methods_use_lzma && M_IS_LZMA(methods[mm]))
continue;
unsigned hdr_c_len = 0;
if (hdr_buf && hdr_u_len)