This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] ld/ldmain.c (main): Use %F instead of %X for einfo().


When src or dst is NULL, the next fread or fwrite will cause segment
fault, so we need treat it as fatal case in einfo().

2015-03-18  Chen Gang <gang.chen.5i5j@gmail.com>

        * ldmain.c (main): Use %F instead of %X for einfo().
---
 ld/ChangeLog | 4 ++++
 ld/ldmain.c  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0f8fbc4..72202c2 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)
 		{
-- 
1.9.3


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]