From 7dc45d65e3b94be6d3a6ebeb0cc15dc1a5b7fb71 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Wed, 7 Dec 2016 18:33:40 +0000 Subject: [PATCH] readelf(1) -S: Include zero index and match binutils' no-name Include the SHN_UNDEF (zero) index special section in extended-attribute ELF files, like GNU binutils' readelf. Additionally, print "" for sections without names, like GNU binutils. Reviewed by: kaiw@ Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D8707 --- contrib/elftoolchain/readelf/readelf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c index d1bf009709e..2d281f30463 100644 --- a/contrib/elftoolchain/readelf/readelf.c +++ b/contrib/elftoolchain/readelf/readelf.c @@ -6557,13 +6557,14 @@ load_sections(struct readelf *re) } if ((name = elf_strptr(re->elf, shstrndx, sh.sh_name)) == NULL) { (void) elf_errno(); - name = "ERROR"; + name = ""; } if ((ndx = elf_ndxscn(scn)) == SHN_UNDEF) { - if ((elferr = elf_errno()) != 0) + if ((elferr = elf_errno()) != 0) { warnx("elf_ndxscn failed: %s", elf_errmsg(elferr)); - continue; + continue; + } } if (ndx >= re->shnum) { warnx("section index of '%s' out of range", name);