From df56ecde8aeed75693f49c9e290427ee5030b05c Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 19 Nov 2019 08:06:24 +1030 Subject: [PATCH] Add space between program name and file for objcopy/strip/objdump messages The GNU coding standard does indicate there should be no space in messages like these, but we tend to put a space in all other messages. This patch cures the inconsistency in: $ binutils/strip-new -F elf32-little -N .text -o pr25200 pr25200.bin binutils/strip-new: pr25200: R_X86_64_PLT32 unsupported binutils/strip-new:pr25200: sorry, cannot handle this file * bucomm.c (bfd_nonfatal_message): Add a space between program name and file. --- binutils/ChangeLog | 5 +++++ binutils/bucomm.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 298a7378854..bf6d20e596e 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2019-11-19 Alan Modra + + * bucomm.c (bfd_nonfatal_message): Add a space between program + name and file. + 2019-11-18 Alan Modra PR 25198 diff --git a/binutils/bucomm.c b/binutils/bucomm.c index 2493fd561bc..78d80bef5f5 100644 --- a/binutils/bucomm.c +++ b/binutils/bucomm.c @@ -64,10 +64,10 @@ bfd_nonfatal (const char *string) bfd error message is printed. In summary, error messages are of one of the following forms: - PROGRAM:file: bfd-error-message - PROGRAM:file[section]: bfd-error-message - PROGRAM:file: printf-message: bfd-error-message - PROGRAM:file[section]: printf-message: bfd-error-message. */ + PROGRAM: file: bfd-error-message + PROGRAM: file[section]: bfd-error-message + PROGRAM: file: printf-message: bfd-error-message + PROGRAM: file[section]: printf-message: bfd-error-message. */ void bfd_nonfatal_message (const char *filename, @@ -97,9 +97,9 @@ bfd_nonfatal_message (const char *filename, section_name = bfd_section_name (section); } if (section_name) - fprintf (stderr, ":%s[%s]", filename, section_name); + fprintf (stderr, ": %s[%s]", filename, section_name); else - fprintf (stderr, ":%s", filename); + fprintf (stderr, ": %s", filename); if (format) { -- 2.30.2