This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Use %F instead of %X for einfo
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 18 Mar 2015 01:17:26 -0000
- Subject: [binutils-gdb] Use %F instead of %X for einfo
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b3862264bc6009a993685ee5e9dd2879a503e36a
commit b3862264bc6009a993685ee5e9dd2879a503e36a
Author: Chen Gang <gang.chen.5i5j@gmail.com>
Date: Wed Mar 18 11:42:19 2015 +1030
Use %F instead of %X for einfo
When src or dst is NULL, the next fread or fwrite will cause a
segmentation fault, so we need to treat it as fatal.
* ldmain.c (main): Use %F instead of %X for einfo.
Diff:
---
ld/ChangeLog | 4 ++++
ld/ldmain.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0f8fbc4..3760916 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-18 Chen Gang <gang.chen.5i5j@gmail.com>
+
+ * ldmain.c (main): Use %F instead of %X for einfo.
+
2015-03-02 Alan Modra <amodra@gmail.com>
* ld.texinfo (Options <-z nocopyreloc>): Rewrite.
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 4b41288..6674a80 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -484,10 +484,10 @@ main (int argc, char **argv)
dst = fopen (dst_name, FOPEN_WB);
if (!src)
- einfo (_("%X%P: unable to open for source of copy `%s'\n"),
+ einfo (_("%P%F: unable to open for source of copy `%s'\n"),
output_filename);
if (!dst)
- einfo (_("%X%P: unable to open for destination of copy `%s'\n"),
+ einfo (_("%P%F: unable to open for destination of copy `%s'\n"),
dst_name);
while ((l = fread (buf, 1, bsize, src)) > 0)
{