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

Added Packer::checkFinalCompressionRatio().

Browse Source 
committer: mfx <mfx> 976775892 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2000-12-14 06:38:12 +00:00
parent f751473195
commit 8ef3beb6c6
13 changed files with 79 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_vmlinz.cpp
+29 -20
View File
@@ -71,11 +71,17 @@ const int *PackVmlinuzI386::getFilters() const
}
bool PackVmlinuzI386::canPack()
{
return readFileHeader() == getFormat();
}
/*************************************************************************
// common routines
// common util routines
**************************************************************************/
int PackVmlinuzI386::readHeader()
int PackVmlinuzI386::readFileHeader()
{
boot_sect_t h;
@@ -95,7 +101,7 @@ int PackVmlinuzI386::readHeader()
}
// read kernel into obuf, gzip-uncompress into ibuf,
// read full kernel into obuf, gzip-uncompress into ibuf,
// return uncompressed size
int PackVmlinuzI386::uncompressKernel()
{
@@ -147,8 +153,9 @@ void PackVmlinuzI386::readKernel()
if (klen <= 0)
throwCantPack("kernel decompression failed");
// OutputFile::dump("kernel.img", ibuf, ulen);
//OutputFile::dump("kernel.img", ibuf, klen);
// copy the setup boot code
setup_buf.alloc(setup_size);
memcpy(setup_buf, obuf, setup_size);
@@ -163,12 +170,6 @@ void PackVmlinuzI386::readKernel()
// vmlinuz specific
**************************************************************************/
bool PackVmlinuzI386::canPack()
{
return readHeader() == UPX_F_VMLINUZ_i386;
}
void PackVmlinuzI386::pack(OutputFile *fo)
{
readKernel();
@@ -203,9 +204,15 @@ void PackVmlinuzI386::pack(OutputFile *fo)
fo->write(setup_buf, setup_buf.getSize());
fo->write(loader, lsize);
fo->write(obuf, clen);
#if 0
printf("%-13s: setup : %8ld bytes\n", getName(), (long) setup_buf.getSize());
printf("%-13s: loader : %8ld bytes\n", getName(), (long) lsize);
printf("%-13s: compressed : %8ld bytes\n", getName(), (long) clen);
#endif
//if (!checkCompressionRatio(file_size, fo->getBytesWritten()))
// throwNotCompressible();
// finally check the compression ratio
if (!checkFinalCompressionRatio(fo))
throwNotCompressible();
}
@@ -213,12 +220,6 @@ void PackVmlinuzI386::pack(OutputFile *fo)
// bvmlinuz specific
**************************************************************************/
bool PackBvmlinuzI386::canPack()
{
return readHeader() == UPX_F_BVMLINUZ_i386;
}
void PackBvmlinuzI386::pack(OutputFile *fo)
{
readKernel();
@@ -277,12 +278,19 @@ void PackBvmlinuzI386::pack(OutputFile *fo)
fo->write(loader, e_len);
fo->write(obuf, clen);
fo->write(loader + e_len, lsize - e_len);
#if 0
printf("%-13s: setup : %8ld bytes\n", getName(), (long) setup_buf.getSize());
printf("%-13s: entry : %8ld bytes\n", getName(), (long) e_len);
printf("%-13s: compressed : %8ld bytes\n", getName(), (long) clen);
printf("%-13s: decompressor : %8ld bytes\n", getName(), (long) (lsize - e_len));
#endif
// verify
verifyOverlappingDecompression(&obuf, overlapoh);
//if (!checkCompressionRatio(file_size, fo->getBytesWritten()))
// throwNotCompressible();
// finally check the compression ratio
if (!checkFinalCompressionRatio(fo))
throwNotCompressible();
}
@@ -295,6 +303,7 @@ int PackVmlinuzI386::canUnpack()
return false;
}
void PackVmlinuzI386::unpack(OutputFile *)
{
// no uncompression support for this format, so that