/* bucomm.c -- Bin Utils COMmon code.
- Copyright (C) 1991-2017 Free Software Foundation, Inc.
+ Copyright (C) 1991-2020 Free Software Foundation, Inc.
This file is part of GNU Binutils.
bfd_nonfatal (const char *string)
{
const char *errmsg;
+ enum bfd_error err = bfd_get_error ();
- errmsg = bfd_errmsg (bfd_get_error ());
+ if (err == bfd_error_no_error)
+ errmsg = _("cause of error unknown");
+ else
+ errmsg = bfd_errmsg (err);
fflush (stdout);
if (string)
fprintf (stderr, "%s: %s: %s\n", program_name, string, errmsg);
bfd error message is printed. In summary, error messages are of
one of the following forms:
- PROGRAM:file: bfd-error-message
- PROGRAM:file[section]: bfd-error-message
- PROGRAM:file: printf-message: bfd-error-message
- PROGRAM:file[section]: printf-message: bfd-error-message. */
+ PROGRAM: file: bfd-error-message
+ PROGRAM: file[section]: bfd-error-message
+ PROGRAM: file: printf-message: bfd-error-message
+ PROGRAM: file[section]: printf-message: bfd-error-message. */
void
bfd_nonfatal_message (const char *filename,
const char *errmsg;
const char *section_name;
va_list args;
+ enum bfd_error err = bfd_get_error ();
- errmsg = bfd_errmsg (bfd_get_error ());
+ if (err == bfd_error_no_error)
+ errmsg = _("cause of error unknown");
+ else
+ errmsg = bfd_errmsg (err);
fflush (stdout);
section_name = NULL;
va_start (args, format);
if (!filename)
filename = bfd_get_archive_filename (abfd);
if (section)
- section_name = bfd_get_section_name (abfd, section);
+ section_name = bfd_section_name (section);
}
if (section_name)
- fprintf (stderr, ":%s[%s]", filename, section_name);
+ fprintf (stderr, ": %s[%s]", filename, section_name);
else
- fprintf (stderr, ":%s", filename);
+ fprintf (stderr, ": %s", filename);
if (format)
{
Mode User\tGroup\tSize\tDate Name */
void
-print_arelt_descr (FILE *file, bfd *abfd, bfd_boolean verbose)
+print_arelt_descr (FILE *file, bfd *abfd, bfd_boolean verbose, bfd_boolean offsets)
{
struct stat buf;
}
}
- fprintf (file, "%s\n", bfd_get_filename (abfd));
+ fprintf (file, "%s", bfd_get_filename (abfd));
+
+ if (offsets)
+ {
+ if (bfd_is_thin_archive (abfd) && abfd->proxy_origin)
+ fprintf (file, " 0x%lx", (unsigned long) abfd->proxy_origin);
+ else if (!bfd_is_thin_archive (abfd) && abfd->origin)
+ fprintf (file, " 0x%lx", (unsigned long) abfd->origin);
+ }
+
+ fprintf (file, "\n");
}
/* Return a path for a new temporary file in the same directory
as FILENAME. */
char *
-make_tempname (char *filename)
+make_tempname (const char *filename)
{
char *tmpname = template_in_dir (filename);
int fd;
directory containing FILENAME. */
char *
-make_tempdir (char *filename)
+make_tempdir (const char *filename)
{
char *tmpname = template_in_dir (filename);