Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-11-16 12:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

objcopy: when an invalid bfd target string is used as a target option, print an error message that references the target string, not the file being copied

Browse Source
This commit is contained in:
Nick Clifton
2025-09-09 08:57:38 +01:00
parent 7ab2cbe8d0
commit 3ac272c1f1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
binutils/objcopy.c
View File

@@ -3876,7 +3876,10 @@ copy_file (const char *input_filename, const char *output_filename, int ofd,
ibfd = bfd_openr (input_filename, target);
if (ibfd == NULL || bfd_stat (ibfd, in_stat) != 0)
{
bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
if (bfd_get_error () == bfd_error_invalid_target && target != NULL)
bfd_nonfatal_message (target, NULL, NULL, NULL);
else
bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
if (ibfd != NULL)
bfd_close (ibfd);
status = 1;
@@ -3951,7 +3954,10 @@ copy_file (const char *input_filename, const char *output_filename, int ofd,
{
if (ofd >= 0)
close (ofd);
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
if (force_output_target && bfd_get_error () == bfd_error_invalid_target)
bfd_nonfatal_message (output_target, NULL, NULL, NULL);
else
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
bfd_close (ibfd);
status = 1;
return;
@@ -4036,7 +4042,10 @@ copy_file (const char *input_filename, const char *output_filename, int ofd,
{
if (ofd >= 0)
close (ofd);
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
if (bfd_get_error () == bfd_error_invalid_target)
bfd_nonfatal_message (output_target, NULL, NULL, NULL);
else
bfd_nonfatal_message (output_filename, NULL, NULL, NULL);
bfd_close (ibfd);
status = 1;
return;