From 47780c9e4cbd312da6d93c9d70c554d34d83dd05 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 30 Sep 2019 14:39:50 +0300 Subject: [PATCH] elflint, readelf: enhance error diagnostics When an input file cannot be opened, include its name into the error diagnostics. Signed-off-by: Dmitry V. Levin --- src/ChangeLog | 6 ++++++ src/elflint.c | 6 +++--- src/readelf.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3007c30d9..db56a136c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2019-09-28 Dmitry V. Levin + + * elflint.c (main): When an input file cannot be opened, + include its name into the error diagnostics. + * readelf.c (main): Likewise. + 2019-09-02 Mark Wielaard * readelf.c (PRINT_DYNSYM_TABLE): New argp key value. diff --git a/src/elflint.c b/src/elflint.c index edb466dd6..684b794e3 100644 --- a/src/elflint.c +++ b/src/elflint.c @@ -151,15 +151,15 @@ main (int argc, char *argv[]) int fd = open (argv[remaining], O_RDONLY); if (fd == -1) { - error (0, errno, gettext ("cannot open input file")); + error (0, errno, _("cannot open input file '%s'"), argv[remaining]); continue; } /* Create an `Elf' descriptor. */ Elf *elf = elf_begin (fd, ELF_C_READ_MMAP, NULL); if (elf == NULL) - ERROR (gettext ("cannot generate Elf descriptor: %s\n"), - elf_errmsg (-1)); + ERROR (_("cannot generate Elf descriptor for '%s': %s\n"), + argv[remaining], elf_errmsg (-1)); else { unsigned int prev_error_count = error_count; diff --git a/src/readelf.c b/src/readelf.c index 5d2b5f438..cbb519d18 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -365,7 +365,7 @@ main (int argc, char *argv[]) int fd = open (argv[remaining], O_RDONLY); if (fd == -1) { - error (0, errno, gettext ("cannot open input file")); + error (0, errno, _("cannot open input file '%s'"), argv[remaining]); continue; } -- 2.47.3