16.mga9/SOURCES/binutils-2.37-filename-in-error-messages.patch


 binutils/readelf.c |   71 ++++++++++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff -Nurp binutils-2.37.orig/binutils/readelf.c binutils-2.37/binutils/readelf.c
--- binutils-2.37.orig/binutils/readelf.c       2021-07-08 14:37:19.000000000 +0300
+++ binutils-2.37/binutils/readelf.c    2021-09-16 22:59:20.643216750 +0300
@@ -21872,46 +21872,53 @@ process_file (char * file_name)
   Filedata * filedata = NULL;
   struct stat statbuf;
   char armag[SARMAG];
-  bool ret = true;
+  bool ret = false;
+  char * name;
+  char * saved_program_name;
+
+  /* Overload program_name to include file_name.  Doing this means
+     that warning/error messages will positively identify the file
+     concerned even when multiple instances of readelf are running.  */
+  name = xmalloc (strlen (program_name) + strlen (file_name) + 3);
+  sprintf (name, "%s: %s", program_name, file_name);
+  saved_program_name = program_name;
+  program_name = name;
 
   if (stat (file_name, &statbuf) < 0)
     {
       if (errno == ENOENT)
-       error (_("'%s': No such file\n"), file_name);
+       error (_("No such file\n"));
       else
-       error (_("Could not locate '%s'.  System error message: %s\n"),
-              file_name, strerror (errno));
-      return false;
+       error (_("Could not locate file.  System error message: %s\n"),
+              strerror (errno));
+      goto done;
     }
 
   if (! S_ISREG (statbuf.st_mode))
     {
-      error (_("'%s' is not an ordinary file\n"), file_name);
-      return false;
+      error (_("Not an ordinary file\n"));
+      goto done;
     }
 
   filedata = calloc (1, sizeof * filedata);
   if (filedata == NULL)
     {
       error (_("Out of memory allocating file data structure\n"));
-      return false;
+      goto done;
     }
 
   filedata->file_name = file_name;
   filedata->handle = fopen (file_name, "rb");
   if (filedata->handle == NULL)
     {
-      error (_("Input file '%s' is not readable.\n"), file_name);
-      free (filedata);
-      return false;
+      error (_("Not readable\n"));
+      goto done;
     }
 
   if (fread (armag, SARMAG, 1, filedata->handle) != 1)
     {
-      error (_("%s: Failed to read file's magic number\n"), file_name);
-      fclose (filedata->handle);
-      free (filedata);
-      return false;
+      error (_("Failed to read file's magic number\n"));
+      goto done;
     }
 
   filedata->file_size = (bfd_size_type) statbuf.st_size;
@@ -21919,33 +21926,39 @@ process_file (char * file_name)
 
   if (memcmp (armag, ARMAG, SARMAG) == 0)
     {
-      if (! process_archive (filedata, false))
-       ret = false;
+      if (process_archive (filedata, false))
+       ret = true;
     }
   else if (memcmp (armag, ARMAGT, SARMAG) == 0)
     {
-      if ( ! process_archive (filedata, true))
-       ret = false;
+      if (process_archive (filedata, true))
+       ret = true;
     }
   else
     {
       if (do_archive_index && !check_all)
-       error (_("File %s is not an archive so its index cannot be displayed.\n"),
-              file_name);
+       error (_("Not an archive so its index cannot be displayed.\n"));
 
       rewind (filedata->handle);
       filedata->archive_file_size = filedata->archive_file_offset = 0;
 
-      if (! process_object (filedata))
-       ret = false;
+      if (process_object (filedata))
+       ret = true;
     }
 
-  fclose (filedata->handle);
-  free (filedata->section_headers);
-  free (filedata->program_headers);
-  free (filedata->string_table);
-  free (filedata->dump.dump_sects);
-  free (filedata);
+ done:
+  if (filedata)
+    {
+      if (filedata->handle != NULL)
+       fclose (filedata->handle);
+      free (filedata->section_headers);
+      free (filedata->program_headers);
+      free (filedata->string_table);
+      free (filedata->dump.dump_sects);
+      free (filedata);
+    }
+  free (program_name);
+  program_name = saved_program_name;
 
   free (ba_cache.strtab);
   ba_cache.strtab = NULL;
1
2	binutils/readelf.c \| 71 ++++++++++++++++++++++++++++++++++++++++++-----------------------------
3	1 file changed, 42 insertions(+), 29 deletions(-)
4
5	diff -Nurp binutils-2.37.orig/binutils/readelf.c binutils-2.37/binutils/readelf.c
6	--- binutils-2.37.orig/binutils/readelf.c 2021-07-08 14:37:19.000000000 +0300
7	+++ binutils-2.37/binutils/readelf.c 2021-09-16 22:59:20.643216750 +0300
8	@@ -21872,46 +21872,53 @@ process_file (char * file_name)
9	Filedata * filedata = NULL;
10	struct stat statbuf;
11	char armag[SARMAG];
12	- bool ret = true;
13	+ bool ret = false;
14	+ char * name;
15	+ char * saved_program_name;
16	+
17	+ /* Overload program_name to include file_name. Doing this means
18	+ that warning/error messages will positively identify the file
19	+ concerned even when multiple instances of readelf are running. */
20	+ name = xmalloc (strlen (program_name) + strlen (file_name) + 3);
21	+ sprintf (name, "%s: %s", program_name, file_name);
22	+ saved_program_name = program_name;
23	+ program_name = name;
24
25	if (stat (file_name, &statbuf) < 0)
26	{
27	if (errno == ENOENT)
28	- error (_("'%s': No such file\n"), file_name);
29	+ error (_("No such file\n"));
30	else
31	- error (_("Could not locate '%s'. System error message: %s\n"),
32	- file_name, strerror (errno));
33	- return false;
34	+ error (_("Could not locate file. System error message: %s\n"),
35	+ strerror (errno));
36	+ goto done;
37	}
38
39	if (! S_ISREG (statbuf.st_mode))
40	{
41	- error (_("'%s' is not an ordinary file\n"), file_name);
42	- return false;
43	+ error (_("Not an ordinary file\n"));
44	+ goto done;
45	}
46
47	filedata = calloc (1, sizeof * filedata);
48	if (filedata == NULL)
49	{
50	error (_("Out of memory allocating file data structure\n"));
51	- return false;
52	+ goto done;
53	}
54
55	filedata->file_name = file_name;
56	filedata->handle = fopen (file_name, "rb");
57	if (filedata->handle == NULL)
58	{
59	- error (_("Input file '%s' is not readable.\n"), file_name);
60	- free (filedata);
61	- return false;
62	+ error (_("Not readable\n"));
63	+ goto done;
64	}
65
66	if (fread (armag, SARMAG, 1, filedata->handle) != 1)
67	{
68	- error (_("%s: Failed to read file's magic number\n"), file_name);
69	- fclose (filedata->handle);
70	- free (filedata);
71	- return false;
72	+ error (_("Failed to read file's magic number\n"));
73	+ goto done;
74	}
75
76	filedata->file_size = (bfd_size_type) statbuf.st_size;
77	@@ -21919,33 +21926,39 @@ process_file (char * file_name)
78
79	if (memcmp (armag, ARMAG, SARMAG) == 0)
80	{
81	- if (! process_archive (filedata, false))
82	- ret = false;
83	+ if (process_archive (filedata, false))
84	+ ret = true;
85	}
86	else if (memcmp (armag, ARMAGT, SARMAG) == 0)
87	{
88	- if ( ! process_archive (filedata, true))
89	- ret = false;
90	+ if (process_archive (filedata, true))
91	+ ret = true;
92	}
93	else
94	{
95	if (do_archive_index && !check_all)
96	- error (_("File %s is not an archive so its index cannot be displayed.\n"),
97	- file_name);
98	+ error (_("Not an archive so its index cannot be displayed.\n"));
99
100	rewind (filedata->handle);
101	filedata->archive_file_size = filedata->archive_file_offset = 0;
102
103	- if (! process_object (filedata))
104	- ret = false;
105	+ if (process_object (filedata))
106	+ ret = true;
107	}
108
109	- fclose (filedata->handle);
110	- free (filedata->section_headers);
111	- free (filedata->program_headers);
112	- free (filedata->string_table);
113	- free (filedata->dump.dump_sects);
114	- free (filedata);
115	+ done:
116	+ if (filedata)
117	+ {
118	+ if (filedata->handle != NULL)
119	+ fclose (filedata->handle);
120	+ free (filedata->section_headers);
121	+ free (filedata->program_headers);
122	+ free (filedata->string_table);
123	+ free (filedata->dump.dump_sects);
124	+ free (filedata);
125	+ }
126	+ free (program_name);
127	+ program_name = saved_program_name;
128
129	free (ba_cache.strtab);
130	ba_cache.strtab = NULL;