From 35f6f998e6bf6ad8ad4a51a9b86bf9020991ea0a Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 10 Nov 2005 03:36:55 +0000 Subject: [PATCH] Avoid warnings. Detabified. committer: mfx 1131593815 +0000 --- src/stub/util/sstrip/sstrip.c | 558 +++++++++++++++++----------------- 1 file changed, 279 insertions(+), 279 deletions(-) diff --git a/src/stub/util/sstrip/sstrip.c b/src/stub/util/sstrip/sstrip.c index 177a574d..e54ab081 100644 --- a/src/stub/util/sstrip/sstrip.c +++ b/src/stub/util/sstrip/sstrip.c @@ -12,7 +12,7 @@ * * sstrip is a small utility that removes the contents at the end of an * ELF file that are not part of the program's memory image. - * + * * Most ELF executables are built with both a program header table and a * section header table. However, only the former is required in order * for the OS to load, link and execute a program. sstrip attempts to @@ -21,7 +21,7 @@ * the file that occur at the end, after the parts to be saved. However, * this almost always includes the section header table, and occasionally * a few random sections that are not used when running a program. - * + * * It should be noted that the GNU bfd library is (understandably) * dependent on the section header table as an index to the file's * contents. Thus, an executable file that has no section header table @@ -33,15 +33,15 @@ * low-priority item, as executables without a section header table are * rare in the extreme.) This probably also explains why strip doesn't * offer the option to do this. - * + * * Shared library files may also have their section header table removed. * Such a library will still function; however, it will no longer be * possible for a compiler to link a new program against it. - * + * * As an added bonus, sstrip also tries to removes trailing zero bytes * from the end of the file. (This normally cannot be done with an * executable that has a section header table.) - * + * * sstrip is a very simplistic program. It depends upon the common * practice of putting the parts of the file that contribute to the * memory image at the front, and the remaining material at the end. This @@ -52,28 +52,28 @@ * sstrip would be useless on such executables. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef TRUE -#define TRUE 1 -#define FALSE 0 +#define TRUE 1 +#define FALSE 0 #endif /* The name of the program. */ -static char const *progname; +static char const *progname; /* The name of the current file. */ -static char const *filename; +static char const *filename; /* A simple error-handling function. FALSE is always returned for the @@ -81,8 +81,8 @@ static char const *filename; */ static int err(char const *errmsg) { - fprintf(stderr, "%s: %s: %s\n", progname, filename, errmsg); - return FALSE; + fprintf(stderr, "%s: %s: %s\n", progname, filename, errmsg); + return FALSE; } /* A flag to signal the need for endian reversal. @@ -92,50 +92,50 @@ static int do_reverse_endian; /* Get a value from the elf header, compensating for endianness. */ #define EGET(X) \ - (__extension__ ({ \ - uint64_t __res; \ - if (!do_reverse_endian) { \ - __res = (X); \ - } else if (sizeof(X) == 1) { \ - __res = (X); \ - } else if (sizeof(X) == 2) { \ - __res = bswap_16((X)); \ - } else if (sizeof(X) == 4) { \ - __res = bswap_32((X)); \ - } else if (sizeof(X) == 8) { \ - __res = bswap_64((X)); \ - } else { \ - fprintf(stderr, "%s: %s: EGET failed for size %d\n", \ - progname, filename, sizeof(X)); \ - exit(EXIT_FAILURE); \ - } \ - __res; \ - })) + (__extension__ ({ \ + uint64_t __res; \ + if (!do_reverse_endian) { \ + __res = (X); \ + } else if (sizeof(X) == 1) { \ + __res = (X); \ + } else if (sizeof(X) == 2) { \ + __res = bswap_16((X)); \ + } else if (sizeof(X) == 4) { \ + __res = bswap_32((X)); \ + } else if (sizeof(X) == 8) { \ + __res = bswap_64((X)); \ + } else { \ + fprintf(stderr, "%s: %s: EGET failed for size %ld\n", \ + progname, filename, (long) sizeof(X)); \ + exit(EXIT_FAILURE); \ + } \ + __res; \ + })) /* Set a value 'Y' in the elf header to 'X', compensating for endianness. */ #define ESET(Y,X) \ - do if (!do_reverse_endian) { \ - Y = (X); \ - } else if (sizeof(Y) == 1) { \ - Y = (X); \ - } else if (sizeof(Y) == 2) { \ - Y = bswap_16((uint16_t)(X)); \ - } else if (sizeof(Y) == 4) { \ - Y = bswap_32((uint32_t)(X)); \ - } else if (sizeof(Y) == 8) { \ - Y = bswap_64((uint64_t)(X)); \ - } else { \ - fprintf(stderr, "%s: %s: ESET failed for size %d\n", \ - progname, filename, sizeof(Y)); \ - exit(EXIT_FAILURE); \ - } while (0) + do if (!do_reverse_endian) { \ + Y = (X); \ + } else if (sizeof(Y) == 1) { \ + Y = (X); \ + } else if (sizeof(Y) == 2) { \ + Y = bswap_16((uint16_t)(X)); \ + } else if (sizeof(Y) == 4) { \ + Y = bswap_32((uint32_t)(X)); \ + } else if (sizeof(Y) == 8) { \ + Y = bswap_64((uint64_t)(X)); \ + } else { \ + fprintf(stderr, "%s: %s: ESET failed for size %ld\n", \ + progname, filename, (long) sizeof(Y)); \ + exit(EXIT_FAILURE); \ + } while (0) /* A macro for I/O errors: The given error message is used only when * errno is not set. */ -#define ferr(msg) (err(errno ? strerror(errno) : (msg))) +#define ferr(msg) (err(errno ? strerror(errno) : (msg))) @@ -147,45 +147,45 @@ static int do_reverse_endian; */ \ static int readelfheader ## CLASS (int fd, Elf ## CLASS ## _Ehdr *ehdr) \ { \ - if (read(fd, ((char *)ehdr)+EI_NIDENT, sizeof(*ehdr) - EI_NIDENT) \ - != sizeof(*ehdr) - EI_NIDENT) \ - return ferr("missing or incomplete ELF header."); \ + if (read(fd, ((char *)ehdr)+EI_NIDENT, sizeof(*ehdr) - EI_NIDENT) \ + != (ssize_t)sizeof(*ehdr) - EI_NIDENT) \ + return ferr("missing or incomplete ELF header."); \ \ - /* Verify the sizes of the ELF header and the program segment \ - * header table entries. \ - */ \ - if (EGET(ehdr->e_ehsize) != sizeof(Elf ## CLASS ## _Ehdr)) \ - return err("unrecognized ELF header size."); \ - if (EGET(ehdr->e_phentsize) != sizeof(Elf ## CLASS ## _Phdr)) \ - return err("unrecognized program segment header size."); \ + /* Verify the sizes of the ELF header and the program segment \ + * header table entries. \ + */ \ + if (EGET(ehdr->e_ehsize) != sizeof(Elf ## CLASS ## _Ehdr)) \ + return err("unrecognized ELF header size."); \ + if (EGET(ehdr->e_phentsize) != sizeof(Elf ## CLASS ## _Phdr)) \ + return err("unrecognized program segment header size."); \ \ - /* Finally, check the file type. \ - */ \ - if (EGET(ehdr->e_type) != ET_EXEC && EGET(ehdr->e_type) != ET_DYN) \ - return err("not an executable or shared-object library."); \ + /* Finally, check the file type. \ + */ \ + if (EGET(ehdr->e_type) != ET_EXEC && EGET(ehdr->e_type) != ET_DYN) \ + return err("not an executable or shared-object library."); \ \ - return TRUE; \ + return TRUE; \ } \ \ /* readphdrtable() loads the program segment header table into memory. \ */ \ static int readphdrtable ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \ - Elf ## CLASS ## _Phdr **phdrs) \ + Elf ## CLASS ## _Phdr **phdrs) \ { \ - size_t size; \ + size_t size; \ \ - if (!EGET(ehdr->e_phoff) || !EGET(ehdr->e_phnum) \ -) return err("ELF file has no program header table."); \ + if (!EGET(ehdr->e_phoff) || !EGET(ehdr->e_phnum) \ +) return err("ELF file has no program header table."); \ \ - size = EGET(ehdr->e_phnum) * sizeof **phdrs; \ - if (!(*phdrs = malloc(size))) \ - return err("Out of memory!"); \ + size = EGET(ehdr->e_phnum) * sizeof **phdrs; \ + if (!(*phdrs = malloc(size))) \ + return err("Out of memory!"); \ \ - errno = 0; \ - if (read(fd, *phdrs, size) != (ssize_t)size) \ - return ferr("missing or incomplete program segment header table."); \ + errno = 0; \ + if (read(fd, *phdrs, size) != (ssize_t)size) \ + return ferr("missing or incomplete program segment header table."); \ \ - return TRUE; \ + return TRUE; \ } \ \ /* getmemorysize() determines the offset of the last byte of the file \ @@ -194,33 +194,33 @@ static int readphdrtable ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \ * is executing, and thus can be safely discarded.) \ */ \ static int getmemorysize ## CLASS (Elf ## CLASS ## _Ehdr const *ehdr, \ - Elf ## CLASS ## _Phdr const *phdrs, \ - unsigned long *newsize) \ + Elf ## CLASS ## _Phdr const *phdrs, \ + unsigned long *newsize) \ { \ - Elf ## CLASS ## _Phdr const *phdr; \ - unsigned long size, n; \ - int i; \ + Elf ## CLASS ## _Phdr const *phdr; \ + unsigned long size, n; \ + size_t i; \ \ - /* Start by setting the size to include the ELF header and the \ - * complete program segment header table. \ - */ \ - size = EGET(ehdr->e_phoff) + EGET(ehdr->e_phnum) * sizeof *phdrs; \ - if (size < sizeof *ehdr) \ - size = sizeof *ehdr; \ + /* Start by setting the size to include the ELF header and the \ + * complete program segment header table. \ + */ \ + size = EGET(ehdr->e_phoff) + EGET(ehdr->e_phnum) * sizeof *phdrs; \ + if (size < sizeof *ehdr) \ + size = sizeof *ehdr; \ \ - /* Then keep extending the size to include whatever data the \ - * program segment header table references. \ - */ \ - for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \ - if (EGET(phdr->p_type) != PT_NULL) { \ - n = EGET(phdr->p_offset) + EGET(phdr->p_filesz); \ - if (n > size) \ - size = n; \ - } \ - } \ + /* Then keep extending the size to include whatever data the \ + * program segment header table references. \ + */ \ + for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \ + if (EGET(phdr->p_type) != PT_NULL) { \ + n = EGET(phdr->p_offset) + EGET(phdr->p_filesz); \ + if (n > size) \ + size = n; \ + } \ + } \ \ - *newsize = size; \ - return TRUE; \ + *newsize = size; \ + return TRUE; \ } \ \ /* modifyheaders() removes references to the section header table if \ @@ -228,85 +228,85 @@ static int getmemorysize ## CLASS (Elf ## CLASS ## _Ehdr const *ehdr, \ * included truncated bytes at the end of the file. \ */ \ static int modifyheaders ## CLASS (Elf ## CLASS ## _Ehdr *ehdr, \ - Elf ## CLASS ## _Phdr *phdrs, \ - unsigned long newsize) \ + Elf ## CLASS ## _Phdr *phdrs, \ + unsigned long newsize) \ { \ - Elf ## CLASS ## _Phdr *phdr; \ - int i; \ + Elf ## CLASS ## _Phdr *phdr; \ + size_t i; \ \ - /* If the section header table is gone, then remove all references \ - * to it in the ELF header. \ - */ \ - if (EGET(ehdr->e_shoff) >= newsize) { \ - ESET(ehdr->e_shoff,0); \ - ESET(ehdr->e_shnum,0); \ - ESET(ehdr->e_shentsize,0); \ - ESET(ehdr->e_shstrndx,0); \ - } \ + /* If the section header table is gone, then remove all references \ + * to it in the ELF header. \ + */ \ + if (EGET(ehdr->e_shoff) >= newsize) { \ + ESET(ehdr->e_shoff,0); \ + ESET(ehdr->e_shnum,0); \ + ESET(ehdr->e_shentsize,0); \ + ESET(ehdr->e_shstrndx,0); \ + } \ \ - /* The program adjusts the file size of any segment that was \ - * truncated. The case of a segment being completely stripped out \ - * is handled separately. \ - */ \ - for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \ - if (EGET(phdr->p_offset) >= newsize) { \ - ESET(phdr->p_offset,newsize); \ - ESET(phdr->p_filesz,0); \ - } else if (EGET(phdr->p_offset) + EGET(phdr->p_filesz) > newsize) { \ - newsize -= EGET(phdr->p_offset); \ - ESET(phdr->p_filesz, newsize); \ - } \ - } \ + /* The program adjusts the file size of any segment that was \ + * truncated. The case of a segment being completely stripped out \ + * is handled separately. \ + */ \ + for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \ + if (EGET(phdr->p_offset) >= newsize) { \ + ESET(phdr->p_offset,newsize); \ + ESET(phdr->p_filesz,0); \ + } else if (EGET(phdr->p_offset) + EGET(phdr->p_filesz) > newsize) { \ + newsize -= EGET(phdr->p_offset); \ + ESET(phdr->p_filesz, newsize); \ + } \ + } \ \ - return TRUE; \ + return TRUE; \ } \ \ /* commitchanges() writes the new headers back to the original file \ * and sets the file to its new size. \ */ \ static int commitchanges ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \ - Elf ## CLASS ## _Phdr *phdrs, \ - unsigned long newsize) \ + Elf ## CLASS ## _Phdr *phdrs, \ + unsigned long newsize) \ { \ - size_t n; \ + size_t n; \ \ - /* Save the changes to the ELF header, if any. \ - */ \ - if (lseek(fd, 0, SEEK_SET)) \ - return ferr("could not rewind file"); \ - errno = 0; \ - if (write(fd, ehdr, sizeof *ehdr) != sizeof *ehdr) \ - return err("could not modify file"); \ + /* Save the changes to the ELF header, if any. \ + */ \ + if (lseek(fd, 0, SEEK_SET)) \ + return ferr("could not rewind file"); \ + errno = 0; \ + if (write(fd, ehdr, sizeof *ehdr) != (ssize_t)sizeof *ehdr) \ + return err("could not modify file"); \ \ - /* Save the changes to the program segment header table, if any. \ - */ \ - if (lseek(fd, EGET(ehdr->e_phoff), SEEK_SET) == (off_t)-1) { \ - err("could not seek in file."); \ - goto warning; \ - } \ - n = EGET(ehdr->e_phnum) * sizeof *phdrs; \ - if (write(fd, phdrs, n) != (ssize_t)n) { \ - err("could not write to file"); \ - goto warning; \ - } \ + /* Save the changes to the program segment header table, if any. \ + */ \ + if (lseek(fd, EGET(ehdr->e_phoff), SEEK_SET) == (off_t)-1) { \ + err("could not seek in file."); \ + goto warning; \ + } \ + n = EGET(ehdr->e_phnum) * sizeof *phdrs; \ + if (write(fd, phdrs, n) != (ssize_t)n) { \ + err("could not write to file"); \ + goto warning; \ + } \ \ - /* Eleventh-hour sanity check: don't truncate before the end of \ - * the program segment header table. \ - */ \ - if (newsize < EGET(ehdr->e_phoff) + n) \ - newsize = EGET(ehdr->e_phoff) + n; \ + /* Eleventh-hour sanity check: don't truncate before the end of \ + * the program segment header table. \ + */ \ + if (newsize < EGET(ehdr->e_phoff) + n) \ + newsize = EGET(ehdr->e_phoff) + n; \ \ - /* Chop off the end of the file. \ - */ \ - if (ftruncate(fd, newsize)) { \ - err("could not resize file"); \ - goto warning; \ - } \ + /* Chop off the end of the file. \ + */ \ + if (ftruncate(fd, newsize)) { \ + err("could not resize file"); \ + goto warning; \ + } \ \ - return TRUE; \ + return TRUE; \ \ warning: \ - return err("ELF file may have been corrupted!"); \ + return err("ELF file may have been corrupted!"); \ } @@ -314,52 +314,52 @@ static int commitchanges ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \ */ static int readelfheaderident(int fd, Elf32_Ehdr *ehdr) { - errno = 0; - if (read(fd, ehdr, EI_NIDENT) != EI_NIDENT) - return ferr("missing or incomplete ELF header."); + errno = 0; + if (read(fd, ehdr, EI_NIDENT) != EI_NIDENT) + return ferr("missing or incomplete ELF header."); - /* Check the ELF signature. - */ - if (!(ehdr->e_ident[EI_MAG0] == ELFMAG0 && - ehdr->e_ident[EI_MAG1] == ELFMAG1 && - ehdr->e_ident[EI_MAG2] == ELFMAG2 && - ehdr->e_ident[EI_MAG3] == ELFMAG3)) - { - err("missing ELF signature."); - return -1; - } + /* Check the ELF signature. + */ + if (!(ehdr->e_ident[EI_MAG0] == ELFMAG0 && + ehdr->e_ident[EI_MAG1] == ELFMAG1 && + ehdr->e_ident[EI_MAG2] == ELFMAG2 && + ehdr->e_ident[EI_MAG3] == ELFMAG3)) + { + err("missing ELF signature."); + return -1; + } - /* Compare the file's class and endianness with the program's. - */ + /* Compare the file's class and endianness with the program's. + */ #if __BYTE_ORDER == __LITTLE_ENDIAN - if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) { - do_reverse_endian = 0; - } else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) { -/* fprintf(stderr, "ELF file has different endianness.\n"); */ - do_reverse_endian = 1; - } + if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) { + do_reverse_endian = 0; + } else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) { +/* fprintf(stderr, "ELF file has different endianness.\n"); */ + do_reverse_endian = 1; + } #elif __BYTE_ORDER == __BIG_ENDIAN - if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) { -/* fprintf(stderr, "ELF file has different endianness.\n"); */ - do_reverse_endian = 1; - } else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) { - do_reverse_endian = 0; - } + if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) { +/* fprintf(stderr, "ELF file has different endianness.\n"); */ + do_reverse_endian = 1; + } else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) { + do_reverse_endian = 0; + } #else #error unkown endianness #endif - else { - err("Unsupported endianness"); - return -1; - } + else { + err("Unsupported endianness"); + return -1; + } - /* Check the target architecture. - */ -/* if (EGET(ehdr->e_machine) != ELF_ARCH) { */ -/* /\* return err("ELF file created for different architecture."); *\/ */ -/* fprintf(stderr, "ELF file created for different architecture.\n"); */ -/* } */ - return ehdr->e_ident[EI_CLASS]; + /* Check the target architecture. + */ +/* if (EGET(ehdr->e_machine) != ELF_ARCH) { */ +/* /\* return err("ELF file created for different architecture."); *\/ */ +/* fprintf(stderr, "ELF file created for different architecture.\n"); */ +/* } */ + return ehdr->e_ident[EI_CLASS]; } @@ -373,29 +373,29 @@ HEADER_FUNCTIONS(64) */ static int truncatezeros(int fd, unsigned long *newsize) { - unsigned char contents[1024]; - unsigned long size, n; + unsigned char contents[1024]; + unsigned long size, n; - size = *newsize; - do { - n = sizeof contents; - if (n > size) - n = size; - if (lseek(fd, size - n, SEEK_SET) == (off_t)-1) - return ferr("cannot seek in file."); - if (read(fd, contents, n) != (ssize_t)n) - return ferr("cannot read file contents"); - while (n && !contents[--n]) - --size; - } while (size && !n); + size = *newsize; + do { + n = sizeof contents; + if (n > size) + n = size; + if (lseek(fd, size - n, SEEK_SET) == (off_t)-1) + return ferr("cannot seek in file."); + if (read(fd, contents, n) != (ssize_t)n) + return ferr("cannot read file contents"); + while (n && !contents[--n]) + --size; + } while (size && !n); - /* Sanity check. - */ - if (!size) - return err("ELF file is completely blank!"); + /* Sanity check. + */ + if (!size) + return err("ELF file is completely blank!"); - *newsize = size; - return TRUE; + *newsize = size; + return TRUE; } /* main() loops over the cmdline arguments, leaving all the real work @@ -403,68 +403,68 @@ static int truncatezeros(int fd, unsigned long *newsize) */ int main(int argc, char *argv[]) { - int fd; - union { - Elf32_Ehdr ehdr32; - Elf64_Ehdr ehdr64; - } e; - union { - Elf32_Phdr *phdrs32; - Elf64_Phdr *phdrs64; - } p; - unsigned long newsize; - char **arg; - int failures = 0; + int fd; + union { + Elf32_Ehdr ehdr32; + Elf64_Ehdr ehdr64; + } e; + union { + Elf32_Phdr *phdrs32; + Elf64_Phdr *phdrs64; + } p; + unsigned long newsize; + char **arg; + int failures = 0; - if (argc < 2 || argv[1][0] == '-') { - printf("Usage: sstrip FILE...\n" - "sstrip discards all nonessential bytes from an executable.\n\n" - "Version 2.0-X Copyright (C) 2000,2001 Brian Raiter.\n" - "Cross-devel hacks Copyright (C) 2004 Manuel Novoa III.\n" - "This program is free software, licensed under the GNU\n" - "General Public License. There is absolutely no warranty.\n"); - return EXIT_SUCCESS; - } + if (argc < 2 || argv[1][0] == '-') { + printf("Usage: sstrip FILE...\n" + "sstrip discards all nonessential bytes from an executable.\n\n" + "Version 2.0-X Copyright (C) 2000,2001 Brian Raiter.\n" + "Cross-devel hacks Copyright (C) 2004 Manuel Novoa III.\n" + "This program is free software, licensed under the GNU\n" + "General Public License. There is absolutely no warranty.\n"); + return EXIT_SUCCESS; + } - progname = argv[0]; + progname = argv[0]; - for (arg = argv + 1 ; *arg != NULL ; ++arg) { - filename = *arg; + for (arg = argv + 1 ; *arg != NULL ; ++arg) { + filename = *arg; - fd = open(*arg, O_RDWR); - if (fd < 0) { - ferr("can't open"); - ++failures; - continue; - } + fd = open(*arg, O_RDWR); + if (fd < 0) { + ferr("can't open"); + ++failures; + continue; + } - switch (readelfheaderident(fd, &e.ehdr32)) { - case ELFCLASS32: - if (!(readelfheader32(fd, &e.ehdr32) && - readphdrtable32(fd, &e.ehdr32, &p.phdrs32) && - getmemorysize32(&e.ehdr32, p.phdrs32, &newsize) && - truncatezeros(fd, &newsize) && - modifyheaders32(&e.ehdr32, p.phdrs32, newsize) && - commitchanges32(fd, &e.ehdr32, p.phdrs32, newsize))) - ++failures; - break; - case ELFCLASS64: - if (!(readelfheader64(fd, &e.ehdr64) && - readphdrtable64(fd, &e.ehdr64, &p.phdrs64) && - getmemorysize64(&e.ehdr64, p.phdrs64, &newsize) && - truncatezeros(fd, &newsize) && - modifyheaders64(&e.ehdr64, p.phdrs64, newsize) && - commitchanges64(fd, &e.ehdr64, p.phdrs64, newsize))) - ++failures; - break; - default: - ++failures; - break; - } - close(fd); - } + switch (readelfheaderident(fd, &e.ehdr32)) { + case ELFCLASS32: + if (!(readelfheader32(fd, &e.ehdr32) && + readphdrtable32(fd, &e.ehdr32, &p.phdrs32) && + getmemorysize32(&e.ehdr32, p.phdrs32, &newsize) && + truncatezeros(fd, &newsize) && + modifyheaders32(&e.ehdr32, p.phdrs32, newsize) && + commitchanges32(fd, &e.ehdr32, p.phdrs32, newsize))) + ++failures; + break; + case ELFCLASS64: + if (!(readelfheader64(fd, &e.ehdr64) && + readphdrtable64(fd, &e.ehdr64, &p.phdrs64) && + getmemorysize64(&e.ehdr64, p.phdrs64, &newsize) && + truncatezeros(fd, &newsize) && + modifyheaders64(&e.ehdr64, p.phdrs64, newsize) && + commitchanges64(fd, &e.ehdr64, p.phdrs64, newsize))) + ++failures; + break; + default: + ++failures; + break; + } + close(fd); + } - return failures ? EXIT_FAILURE : EXIT_SUCCESS; + return failures ? EXIT_FAILURE : EXIT_SUCCESS; } /*