From a7fd742c17afcbeb53e0541cbe4ecaeff2d69acb Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 21 Sep 2016 23:58:08 +0200 Subject: [PATCH] Canonicalize the names of our executable formats. --- src/help.cpp | 2 +- src/p_lx_elf.h | 20 ++++++++++---------- src/p_lx_exc.h | 4 ++-- src/p_lx_sh.h | 2 +- src/p_mach.h | 34 +++++++++++++++++----------------- src/p_vmlinx.h | 10 +++++----- src/p_vmlinz.h | 10 +++++----- src/packer.cpp | 6 +++--- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/help.cpp b/src/help.cpp index ab5658a2..d4a2347f 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -138,7 +138,7 @@ static void show_all_packers(FILE *f, int verbose) const char *sn = pn.names[i].sname; if (verbose) { - con_fprintf(f, " %-32s %s\n", fn, sn); + con_fprintf(f, " %-36s %s\n", fn, sn); } else { diff --git a/src/p_lx_elf.h b/src/p_lx_elf.h index e269266a..943a51bd 100644 --- a/src/p_lx_elf.h +++ b/src/p_lx_elf.h @@ -374,7 +374,7 @@ public: PackLinuxElf64amd(InputFile *f); virtual ~PackLinuxElf64amd(); virtual int getFormat() const { return UPX_F_LINUX_ELF64_AMD; } - virtual const char *getName() const { return "linux/ElfAMD"; } + virtual const char *getName() const { return "linux/amd64"; } virtual const char *getFullName(const options_t *) const { return "amd64-linux.elf"; } virtual const int *getFilters() const; virtual bool canPack(); @@ -398,7 +398,7 @@ public: PackLinuxElf32ppc(InputFile *f); virtual ~PackLinuxElf32ppc(); virtual int getFormat() const { return UPX_F_LINUX_ELFPPC32; } - virtual const char *getName() const { return "linux/ElfPPC"; } + virtual const char *getName() const { return "linux/ppc32"; } virtual const char *getFullName(const options_t *) const { return "powerpc-linux.elf"; } virtual const int *getFilters() const; protected: @@ -418,8 +418,8 @@ public: PackLinuxElf64ppcle(InputFile *f); virtual ~PackLinuxElf64ppcle(); virtual int getFormat() const { return UPX_F_LINUX_ELFPPC64LE; } - virtual const char *getName() const { return "ElfPPC64LE"; } - virtual const char *getFullName(const options_t *) const { return "ppc64le-linux.elf"; } + virtual const char *getName() const { return "linux/ppc64le"; } + virtual const char *getFullName(const options_t *) const { return "powerpc64le-linux.elf"; } virtual const int *getFilters() const; protected: unsigned lg2_page; // log2(PAGE_SIZE) @@ -442,7 +442,7 @@ public: PackLinuxElf32x86(InputFile *f); virtual ~PackLinuxElf32x86(); virtual int getFormat() const { return UPX_F_LINUX_ELF_i386; } - virtual const char *getName() const { return "linux/elf386"; } + virtual const char *getName() const { return "linux/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-linux.elf"; } virtual const int *getFilters() const; @@ -462,7 +462,7 @@ public: PackBSDElf32x86(InputFile *f); virtual ~PackBSDElf32x86(); virtual int getFormat() const { return UPX_F_BSD_ELF_i386; } - virtual const char *getName() const { return "BSD/elf386"; } + virtual const char *getName() const { return "bsd/i386"; } protected: virtual void pack1(OutputFile *, Filter &); // generate executable header @@ -485,7 +485,7 @@ class PackNetBSDElf32x86 : public PackLinuxElf32x86 public: PackNetBSDElf32x86(InputFile *f); virtual ~PackNetBSDElf32x86(); - virtual const char *getName() const { return "netbsd/elf386"; } + virtual const char *getName() const { return "netbsd/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-netbsd.elf"; } protected: virtual void buildLoader(const Filter *ft); @@ -502,7 +502,7 @@ class PackOpenBSDElf32x86 : public PackBSDElf32x86 public: PackOpenBSDElf32x86(InputFile *f); virtual ~PackOpenBSDElf32x86(); - virtual const char *getName() const { return "opnbsd/elf386"; } + virtual const char *getName() const { return "opnbsd/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-openbsd.elf"; } protected: @@ -526,7 +526,7 @@ public: PackLinuxElf32armLe(InputFile *f); virtual ~PackLinuxElf32armLe(); virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMEL; } - virtual const char *getName() const { return "linux/armel"; } + virtual const char *getName() const { return "linux/arm"; } virtual const char *getFullName(const options_t *) const { return "arm-linux.elf"; } virtual const int *getFilters() const; @@ -566,7 +566,7 @@ public: PackLinuxElf32mipseb(InputFile *f); virtual ~PackLinuxElf32mipseb(); virtual int getFormat() const { return UPX_F_LINUX_ELF32_MIPSEB; } - virtual const char *getName() const { return "linux/mipseb"; } + virtual const char *getName() const { return "linux/mips"; } virtual const char *getFullName(const options_t *) const { return "mips-linux.elf"; } virtual const int *getFilters() const; diff --git a/src/p_lx_exc.h b/src/p_lx_exc.h index 7852af8c..886ad7ad 100644 --- a/src/p_lx_exc.h +++ b/src/p_lx_exc.h @@ -48,7 +48,7 @@ public: unsigned const brka ); virtual int getFormat() const { return UPX_F_LINUX_i386; } - virtual const char *getName() const { return "linux/386"; } + virtual const char *getName() const { return "linux.exec/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.execve"; } virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; @@ -135,7 +135,7 @@ class PackBSDI386 : public PackLinuxI386 public: PackBSDI386(InputFile *f); virtual int getFormat() const { return UPX_F_BSD_i386; } - virtual const char *getName() const { return "BSD/386"; } + virtual const char *getName() const { return "bsd.exec/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-bsd.elf.execve"; } protected: diff --git a/src/p_lx_sh.h b/src/p_lx_sh.h index f1221650..a05b5aca 100644 --- a/src/p_lx_sh.h +++ b/src/p_lx_sh.h @@ -46,7 +46,7 @@ public: virtual ~PackLinuxI386sh(); virtual int getVersion() const { return 13; } virtual int getFormat() const { return UPX_F_LINUX_SH_i386; } - virtual const char *getName() const { return "linux/sh386"; } + virtual const char *getName() const { return "linux.sh/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.shell"; } virtual const int *getFilters() const { return NULL; } virtual void buildLoader(const Filter *); diff --git a/src/p_mach.h b/src/p_mach.h index 359ccf54..be8aac1b 100644 --- a/src/p_mach.h +++ b/src/p_mach.h @@ -765,7 +765,7 @@ public: PackMachPPC32(InputFile *f); virtual int getFormat() const { return UPX_F_MACH_PPC32; } - virtual const char *getName() const { return "Mach/ppc32"; } + virtual const char *getName() const { return "macho/ppc32"; } virtual const char *getFullName(const options_t *) const { return "powerpc-darwin.macho"; } protected: @@ -798,8 +798,8 @@ public: PackMachPPC64LE(InputFile *f); virtual int getFormat() const { return UPX_F_MACH_PPC64LE; } - virtual const char *getName() const { return "Mach/ppc64LE"; } - virtual const char *getFullName(const options_t *) const { return "ppc64le-darwin.macho"; } + virtual const char *getName() const { return "macho/ppc64le"; } + virtual const char *getFullName(const options_t *) const { return "powerpc64le-darwin.macho"; } protected: virtual const int *getFilters() const; @@ -831,7 +831,7 @@ public: PackDylibPPC32(InputFile *f); virtual int getFormat() const { return UPX_F_DYLIB_PPC32; } - virtual const char *getName() const { return "Dylib/ppc32"; } + virtual const char *getName() const { return "dylib/ppc32"; } virtual const char *getFullName(const options_t *) const { return "powerpc-darwin.dylib"; } protected: virtual void pack3(OutputFile *, Filter &); // append loader @@ -847,8 +847,8 @@ public: PackDylibPPC64LE(InputFile *f); virtual int getFormat() const { return UPX_F_DYLIB_PPC64LE; } - virtual const char *getName() const { return "Dylib/ppc64LE"; } - virtual const char *getFullName(const options_t *) const { return "ppc64le-darwin.dylib"; } + virtual const char *getName() const { return "dylib/ppc64le"; } + virtual const char *getFullName(const options_t *) const { return "powerpc64le-darwin.dylib"; } protected: virtual void pack3(OutputFile *, Filter &); // append loader virtual void pack4(OutputFile *, Filter &); // append PackHeader @@ -863,7 +863,7 @@ public: PackMachI386(InputFile *f); virtual int getFormat() const { return UPX_F_MACH_i386; } - virtual const char *getName() const { return "Mach/i386"; } + virtual const char *getName() const { return "macho/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-darwin.macho"; } protected: virtual const int *getFilters() const; @@ -896,7 +896,7 @@ public: PackDylibI386(InputFile *f); virtual int getFormat() const { return UPX_F_DYLIB_i386; } - virtual const char *getName() const { return "Dylib/i386"; } + virtual const char *getName() const { return "dylib/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-darwin.dylib"; } protected: virtual void pack3(OutputFile *, Filter &); // append loader @@ -912,8 +912,8 @@ public: PackMachAMD64(InputFile *f); virtual int getFormat() const { return UPX_F_MACH_AMD64; } - virtual const char *getName() const { return "Mach/AMD64"; } - virtual const char *getFullName(const options_t *) const { return "AMD64-darwin.macho"; } + virtual const char *getName() const { return "macho/amd64"; } + virtual const char *getFullName(const options_t *) const { return "amd64-darwin.macho"; } protected: virtual const int *getFilters() const; @@ -945,8 +945,8 @@ public: PackDylibAMD64(InputFile *f); virtual int getFormat() const { return UPX_F_DYLIB_AMD64; } - virtual const char *getName() const { return "Dylib/AMD64"; } - virtual const char *getFullName(const options_t *) const { return "AMD64-darwin.dylib"; } + virtual const char *getName() const { return "dylib/amd64"; } + virtual const char *getFullName(const options_t *) const { return "amd64-darwin.dylib"; } protected: virtual void pack3(OutputFile *, Filter &); // append loader virtual void pack4(OutputFile *, Filter &); // append PackHeader @@ -961,8 +961,8 @@ public: PackMachARMEL(InputFile *f); virtual int getFormat() const { return UPX_F_MACH_ARMEL; } - virtual const char *getName() const { return "Mach/ARMEL"; } - virtual const char *getFullName(const options_t *) const { return "ARMEL-darwin.macho"; } + virtual const char *getName() const { return "macho/arm"; } + virtual const char *getFullName(const options_t *) const { return "arm-darwin.macho"; } protected: virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; @@ -995,8 +995,8 @@ public: PackMachARM64EL(InputFile *f); virtual int getFormat() const { return UPX_F_MACH_ARM64EL; } - virtual const char *getName() const { return "Mach/ARM64EL"; } - virtual const char *getFullName(const options_t *) const { return "ARM64EL-darwin.macho"; } + virtual const char *getName() const { return "macho/arm64"; } + virtual const char *getFullName(const options_t *) const { return "arm64-darwin.macho"; } protected: virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; @@ -1030,7 +1030,7 @@ public: virtual int getVersion() const { return 13; } virtual int getFormat() const { return UPX_F_MACH_FAT; } - virtual const char *getName() const { return "Mach/fat"; } + virtual const char *getName() const { return "macho/fat"; } virtual const char *getFullName(const options_t *) const { return "fat-darwin.macho"; } virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; diff --git a/src/p_vmlinx.h b/src/p_vmlinx.h index c3445b98..c44d3903 100644 --- a/src/p_vmlinx.h +++ b/src/p_vmlinx.h @@ -101,7 +101,7 @@ public: PackVmlinuxI386(InputFile *f) : super(f, Ehdr::EM_386, Ehdr::ELFCLASS32, Ehdr::ELFDATA2LSB, "startup_32") { } virtual int getFormat() const { return UPX_F_VMLINUX_i386; } - virtual const char *getName() const { return "vmlinux/386"; } + virtual const char *getName() const { return "vmlinux/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-linux.kernel.vmlinux"; } virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; @@ -126,7 +126,7 @@ public: PackVmlinuxARMEL(InputFile *f) : super(f, Ehdr::EM_ARM, Ehdr::ELFCLASS32, Ehdr::ELFDATA2LSB, "decompress_kernel") { } virtual int getFormat() const { return UPX_F_VMLINUX_ARMEL; } - virtual const char *getName() const { return "vmlinux/armel"; } + virtual const char *getName() const { return "vmlinux/arm"; } virtual const char *getFullName(const options_t *) const { return "arm-linux.kernel.vmlinux"; } virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; @@ -198,8 +198,8 @@ public: PackVmlinuxPPC64LE(InputFile *f) : super(f, Ehdr::EM_PPC64, Ehdr::ELFCLASS64, Ehdr::ELFDATA2LSB, "_vmlinux_start") { } virtual int getFormat() const { return UPX_F_VMLINUX_PPC64LE; } - virtual const char *getName() const { return "ppc64LE"; } - virtual const char *getFullName(const options_t *) const { return "ppc64le-linux.kernel.vmlinux"; } + virtual const char *getName() const { return "vmlinux/ppc64le"; } + virtual const char *getFullName(const options_t *) const { return "powerpc64le-linux.kernel.vmlinux"; } virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; @@ -223,7 +223,7 @@ public: PackVmlinuxAMD64(InputFile *f) : super(f, Ehdr::EM_X86_64, Ehdr::ELFCLASS64, Ehdr::ELFDATA2LSB, "startup_32") { } virtual int getFormat() const { return UPX_F_VMLINUX_AMD64; } - virtual const char *getName() const { return "vmlinux/AMD64"; } + virtual const char *getName() const { return "vmlinux/amd64"; } virtual const char *getFullName(const options_t *) const { return "amd64-linux.kernel.vmlinux"; } virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; diff --git a/src/p_vmlinz.h b/src/p_vmlinz.h index 59ef34e6..a3fd76e0 100644 --- a/src/p_vmlinz.h +++ b/src/p_vmlinz.h @@ -41,7 +41,7 @@ public: PackVmlinuzI386(InputFile *f); virtual int getVersion() const { return 13; } virtual int getFormat() const { return UPX_F_VMLINUZ_i386; } - virtual const char *getName() const { return "vmlinuz/386"; } + virtual const char *getName() const { return "vmlinuz/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-linux.kernel.vmlinuz"; } virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; @@ -110,7 +110,7 @@ class PackBvmlinuzI386 : public PackVmlinuzI386 public: PackBvmlinuzI386(InputFile *f) : super(f) { } virtual int getFormat() const { return UPX_F_BVMLINUZ_i386; } - virtual const char *getName() const { return "bvmlinuz/386"; } + virtual const char *getName() const { return "bvmlinuz/i386"; } virtual const char *getFullName(const options_t *) const { return "i386-linux.kernel.bvmlinuz"; } virtual const int *getFilters() const; @@ -131,7 +131,7 @@ class PackElks8086 : public PackVmlinuzI386 public: PackElks8086(InputFile *f) : super(f) { } virtual int getFormat() const { return UPX_F_ELKS_8086; } - virtual const char *getName() const { return "elks/8086"; } + virtual const char *getName() const { return "elks/i086"; } virtual const char *getFullName(const options_t *) const { return "i086-elks ???"; } virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; @@ -160,8 +160,8 @@ public: PackVmlinuzARMEL(InputFile *f); virtual int getVersion() const { return 13; } virtual int getFormat() const { return UPX_F_VMLINUZ_ARMEL; } - virtual const char *getName() const { return "vmlinuz/armel"; } - virtual const char *getFullName(const options_t *) const { return "armel-linux.kernel.vmlinuz"; } + virtual const char *getName() const { return "vmlinuz/arm"; } + virtual const char *getFullName(const options_t *) const { return "arm-linux.kernel.vmlinuz"; } virtual const int *getCompressionMethods(int method, int level) const; virtual const int *getFilters() const; virtual int getStrategy(Filter &); diff --git a/src/packer.cpp b/src/packer.cpp index f6d62874..28d8d3c9 100644 --- a/src/packer.cpp +++ b/src/packer.cpp @@ -66,9 +66,9 @@ void Packer::assertPacker() const assert(getVersion() >= 11); assert(getVersion() <= 14); assert(strlen(getName()) <= 15); - // info: 32 is limit for show_all_packers() in help.cpp - assert(strlen(getFullName(opt)) <= 28); - assert(strlen(getFullName(NULL)) <= 28); + // info: 36 is the limit for show_all_packers() in help.cpp + assert(strlen(getFullName(opt)) <= 32); + assert(strlen(getFullName(NULL)) <= 32); if (bele == NULL) fprintf(stderr, "%s\n", getName()); assert(bele != NULL); #if 1