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

Display full format name with --fileinfo.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2006-11-30 23:34:19 +01:00
parent 665dcf221b
commit fa95c3c4a2
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/help.cpp
View File

@ -103,6 +103,7 @@ struct PackerNames
PackerNames() { names_count = 0; o = NULL; }
void add(Packer *p)
{
p->assertPacker();
assert(names_count < 32);
names[names_count].fname = p->getFullName(o);
names[names_count].sname = p->getName();

2
src/p_com.h
View File

@ -42,7 +42,7 @@ public:
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_DOS_COM; }
virtual const char *getName() const { return "dos/com"; }
virtual const char *getFullName(const options_t *o) const { return o->cpu == o->CPU_8086 ? "i086-dos16.com" : "i286-dos16.com"; }
virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.com" : "i286-dos16.com"; }
virtual const int *getCompressionMethods(int method, int level) const;
virtual const int *getFilters() const;

2
src/p_exe.h
View File

@ -42,7 +42,7 @@ public:
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_DOS_EXE; }
virtual const char *getName() const { return "dos/exe"; }
virtual const char *getFullName(const options_t *o) const { return o->cpu == o->CPU_8086 ? "i086-dos16.exe" : "i286-dos16.exe"; }
virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.exe" : "i286-dos16.exe"; }
virtual const int *getCompressionMethods(int method, int level) const;
virtual const int *getFilters() const;

2
src/p_sys.h
View File

@ -42,7 +42,7 @@ public:
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_DOS_SYS; }
virtual const char *getName() const { return "dos/sys"; }
virtual const char *getFullName(const options_t *o) const { return o->cpu == o->CPU_8086 ? "i086-dos16.sys" : "i286-dos16.sys"; }
virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.sys" : "i286-dos16.sys"; }
virtual bool canPack();

2
src/p_w16ne.h
View File

@ -42,7 +42,7 @@ public:
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_WIN16_NE; }
virtual const char *getName() const { return "win16/ne"; }
virtual const char *getFullName(const options_t *o) const { return o->cpu == o->CPU_286 ? "i286-win16.ne" : "i386-win16.ne"; }
virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_286 ? "i286-win16.ne" : "i386-win16.ne"; }
virtual const int *getCompressionMethods(int method, int level) const;
virtual const int *getFilters() const;

3
src/packer.cpp
View File

@ -67,7 +67,8 @@ void Packer::assertPacker()
assert(getVersion() >= 11);
assert(getVersion() <= 14);
assert(strlen(getName()) <= 13);
assert(strlen(getFullName(opt)) <= 26); // "i386-linux.kernel.bvmlinuz"
assert(strlen(getFullName(opt)) <= 26); // "i386-linux.kernel.bvmlinuz"
assert(strlen(getFullName(NULL)) <= 26); // "i386-linux.kernel.bvmlinuz"
if (bele == NULL) fprintf(stderr, "%s\n", getName());
assert(bele != NULL);
#if 1

2
src/ui.cpp
View File

@ -665,7 +665,7 @@ bool UiPacker::uiFileInfoStart()
total_files++;
int fg = con_fg(stdout,FG_CYAN);
con_fprintf(stdout,"%s [%s]\n", p->fi->getName(), p->getName());
con_fprintf(stdout,"%s [%s, %s]\n", p->fi->getName(), p->getFullName(opt), p->getName());
fg = con_fg(stdout,fg);
UNUSED(fg);
if (p->ph.c_len > 0)