1 --- binutils.orig/binutils/readelf.c 2020-07-24 14:55:25.163647522 +0100
2 +++ binutils-2.35/binutils/readelf.c 2020-07-24 15:02:39.613851369 +0100
3 @@ -20729,79 +20729,92 @@ process_file (char * file_name)
4 Filedata * filedata = NULL;
7 - bfd_boolean ret = TRUE;
8 + bfd_boolean ret = FALSE;
10 + char * saved_program_name;
12 + /* Overload program_name to include file_name. Doing this means
13 + that warning/error messages will positively identify the file
14 + concerned even when multiple instances of readelf are running. */
15 + name = xmalloc (strlen (program_name) + strlen (file_name) + 3);
16 + sprintf (name, "%s: %s", program_name, file_name);
17 + saved_program_name = program_name;
18 + program_name = name;
20 if (stat (file_name, &statbuf) < 0)
23 - error (_("'%s': No such file\n"), file_name);
24 + error (_("No such file\n"));
26 - error (_("Could not locate '%s'. System error message: %s\n"),
27 - file_name, strerror (errno));
29 + error (_("Could not locate file. System error message: %s\n"),
34 if (! S_ISREG (statbuf.st_mode))
36 - error (_("'%s' is not an ordinary file\n"), file_name);
38 + error (_("Not an ordinary file\n"));
42 filedata = calloc (1, sizeof * filedata);
45 error (_("Out of memory allocating file data structure\n"));
50 filedata->file_name = file_name;
51 filedata->handle = fopen (file_name, "rb");
52 if (filedata->handle == NULL)
54 - error (_("Input file '%s' is not readable.\n"), file_name);
57 + error (_("Not readable\n"));
61 if (fread (armag, SARMAG, 1, filedata->handle) != 1)
63 - error (_("%s: Failed to read file's magic number\n"), file_name);
64 + error (_("Failed to read file's magic number\n"));
65 fclose (filedata->handle);
71 filedata->file_size = (bfd_size_type) statbuf.st_size;
73 if (memcmp (armag, ARMAG, SARMAG) == 0)
75 - if (! process_archive (filedata, FALSE))
77 + if (process_archive (filedata, FALSE))
80 else if (memcmp (armag, ARMAGT, SARMAG) == 0)
82 - if ( ! process_archive (filedata, TRUE))
84 + if (process_archive (filedata, TRUE))
89 if (do_archive_index && !check_all)
90 - error (_("File %s is not an archive so its index cannot be displayed.\n"),
92 + error (_("Not an archive so its index cannot be displayed.\n"));
94 rewind (filedata->handle);
95 filedata->archive_file_size = filedata->archive_file_offset = 0;
97 - if (! process_object (filedata))
99 + if (process_object (filedata))
103 - fclose (filedata->handle);
104 - free (filedata->section_headers);
105 - free (filedata->program_headers);
106 - free (filedata->string_table);
107 - free (filedata->dump.dump_sects);
112 + fclose (filedata->handle);
113 + free (filedata->section_headers);
114 + free (filedata->program_headers);
115 + free (filedata->string_table);
116 + free (filedata->dump.dump_sects);
119 + free (program_name);
120 + program_name = saved_program_name;
122 free (ba_cache.strtab);
123 ba_cache.strtab = NULL;
124 --- binutils.orig/binutils/readelf.c 2021-01-07 12:59:35.802994842 +0000
125 +++ binutils-2.35.1/binutils/readelf.c 2021-01-07 13:02:36.591754005 +0000
126 @@ -20818,7 +20818,8 @@ process_file (char * file_name)
130 - fclose (filedata->handle);
131 + if (filedata->handle != NULL)
132 + fclose (filedata->handle);
133 free (filedata->section_headers);
134 free (filedata->program_headers);
135 free (filedata->string_table);
136 --- binutils.orig/binutils/readelf.c 2021-01-08 17:01:23.573093204 +0000
137 +++ binutils-2.35.1/binutils/readelf.c 2021-01-08 17:02:23.095677242 +0000
138 @@ -20787,7 +20787,6 @@ process_file (char * file_name)
139 if (fread (armag, SARMAG, 1, filedata->handle) != 1)
141 error (_("Failed to read file's magic number\n"));
142 - fclose (filedata->handle);