mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-25 16:57:52 +00:00
2010-02-05 Hui Zhu <teawater@gmail.com>
* defs.h (gdb_bfd_errmsg): New extern. * exec.c (exec_file_attach): Change bfd_errmsg to gdb_bfd_errmsg. * utils.c (AMBIGUOUS_MESS1): New macro. (AMBIGUOUS_MESS2): New macro. (gdb_bfd_errmsg): New function.
This commit is contained in:
40
gdb/utils.c
40
gdb/utils.c
@@ -3608,6 +3608,46 @@ compare_positive_ints (const void *ap, const void *bp)
|
||||
return * (int *) ap - * (int *) bp;
|
||||
}
|
||||
|
||||
#define AMBIGUOUS_MESS1 ".\nMatching formats:"
|
||||
#define AMBIGUOUS_MESS2 ".\nUse \"set gnutarget format-name\" to specify the format."
|
||||
|
||||
const char *
|
||||
gdb_bfd_errmsg (bfd_error_type error_tag, char **matching)
|
||||
{
|
||||
char *ret, *retp;
|
||||
int ret_len;
|
||||
char **p;
|
||||
|
||||
/* Check if errmsg just need simple return. */
|
||||
if (error_tag != bfd_error_file_ambiguously_recognized || matching == NULL)
|
||||
return bfd_errmsg (error_tag);
|
||||
|
||||
ret_len = strlen (bfd_errmsg (error_tag)) + strlen (AMBIGUOUS_MESS1)
|
||||
+ strlen (AMBIGUOUS_MESS2);
|
||||
for (p = matching; *p; p++)
|
||||
ret_len += strlen (*p) + 1;
|
||||
ret = xmalloc (ret_len + 1);
|
||||
retp = ret;
|
||||
make_cleanup (xfree, ret);
|
||||
|
||||
strcpy (retp, bfd_errmsg (error_tag));
|
||||
retp += strlen (retp);
|
||||
|
||||
strcpy (retp, AMBIGUOUS_MESS1);
|
||||
retp += strlen (retp);
|
||||
|
||||
for (p = matching; *p; p++)
|
||||
{
|
||||
sprintf (retp, " %s", *p);
|
||||
retp += strlen (retp);
|
||||
}
|
||||
xfree (matching);
|
||||
|
||||
strcpy (retp, AMBIGUOUS_MESS2);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Provide a prototype to silence -Wmissing-prototypes. */
|
||||
extern initialize_file_ftype _initialize_utils;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user