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

Re-synced `identtiny' from 1.2 branch.

Browse Source 
committer: mfx <mfx> 1034741770 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2002-10-16 04:16:10 +00:00
parent cecfaaf63e
commit ac245b39d5
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/packer.cpp
+18 -10
View File
@@ -965,7 +965,7 @@ const int *Packer::getDefaultCompressionMethods_LE32(int method, int level, int
// loader util
**************************************************************************/
char const *Packer::identstr(unsigned &size)
char const *Packer::getIdentstr(unsigned *size, int small)
{
static const char identbig[] =
"\n\0"
@@ -981,20 +981,28 @@ char const *Packer::identstr(unsigned &size)
"$Id: UPX "
"(C) 1996-2002 the UPX Team. All Rights Reserved. http://upx.sf.net $"
"\n";
// static const char identtiny[] = UPX_VERSION_STRING4;
// FIXME
static const char identtiny[] = UPX_VERSION_STRING4;
if (opt->small) {
size = sizeof(identsmall);
if (small < 0)
small = opt->small;
if (small >= 2)
{
*size = sizeof(identtiny);
return identtiny;
}
else if (small >= 1)
{
*size = sizeof(identsmall);
return identsmall;
}
else {
size = sizeof(identbig);
else
{
*size = sizeof(identbig);
return identbig;
}
}
void Packer::initLoader(const void *pdata, int plen, int pinfo)
void Packer::initLoader(const void *pdata, int plen, int pinfo, int small)
{
if (pinfo < 0)
{
@@ -1009,8 +1017,8 @@ void Packer::initLoader(const void *pdata, int plen, int pinfo)
linker = new BeLinker(pdata, plen, pinfo); // big endian
unsigned size;
char const *const ident = identstr(size);
linker->addSection("IDENTSTR",ident,size);
char const * const ident = getIdentstr(&size, small);
linker->addSection("IDENTSTR", ident, size);
}