/* bucomm.c -- Bin Utils COMmon code.
- Copyright (C) 1991, 92, 93, 94, 95, 1997 Free Software Foundation, Inc.
+ Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001
+ Free Software Foundation, Inc.
This file is part of GNU Binutils.
#include "bfd.h"
#include "libiberty.h"
#include "bucomm.h"
+#include "filenames.h"
#include <sys/stat.h>
#include <time.h> /* ctime, maybe time_t */
typedef long time_t;
#endif
#endif
-
-#ifdef ANSI_PROTOTYPES
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-char *target = NULL; /* default as late as possible */
\f
/* Error reporting */
xexit (1);
}
+void
+report (format, args)
+ const char * format;
+ va_list args;
+{
+ fprintf (stderr, "%s: ", program_name);
+ vfprintf (stderr, format, args);
+ putc ('\n', stderr);
+}
+
#ifdef ANSI_PROTOTYPES
void
fatal (const char *format, ...)
{
va_list args;
- fprintf (stderr, "%s: ", program_name);
va_start (args, format);
- vfprintf (stderr, format, args);
+ report (format, args);
va_end (args);
- putc ('\n', stderr);
xexit (1);
}
+
+void
+non_fatal (const char *format, ...)
+{
+ va_list args;
+
+ va_start (args, format);
+ report (format, args);
+ va_end (args);
+}
#else
void
fatal (va_alist)
char *Format;
va_list args;
- fprintf (stderr, "%s: ", program_name);
va_start (args);
Format = va_arg (args, char *);
- vfprintf (stderr, Format, args);
+ report (Format, args);
va_end (args);
- putc ('\n', stderr);
xexit (1);
}
+
+void
+non_fatal (va_alist)
+ va_dcl
+{
+ char *Format;
+ va_list args;
+
+ va_start (args);
+ Format = va_arg (args, char *);
+ report (Format, args);
+ va_end (args);
+}
#endif
/* Set the default BFD target based on the configured target. Doing
const char *target = TARGET;
if (! bfd_set_default_target (target))
- {
- char *errmsg;
-
- errmsg = (char *) xmalloc (100 + strlen (target));
- sprintf (errmsg, "can't set BFD default target to `%s'", target);
- bfd_fatal (errmsg);
- }
+ fatal (_("can't set BFD default target to `%s': %s"),
+ target, bfd_errmsg (bfd_get_error ()));
}
/* After a false return from bfd_check_format_matches with
list_matching_formats (p)
char **p;
{
- fprintf(stderr, "%s: Matching formats:", program_name);
+ fprintf (stderr, _("%s: Matching formats:"), program_name);
while (*p)
- fprintf(stderr, " %s", *p++);
- fprintf(stderr, "\n");
+ fprintf (stderr, " %s", *p++);
+ fputc ('\n', stderr);
}
/* List the supported targets. */
const char *name;
FILE *f;
{
- extern bfd_target *bfd_target_vector[];
+ extern const bfd_target *const *bfd_target_vector;
int t;
if (name == NULL)
- fprintf (f, "Supported targets:");
+ fprintf (f, _("Supported targets:"));
else
- fprintf (f, "%s: supported targets:", name);
+ fprintf (f, _("%s: supported targets:"), name);
for (t = 0; bfd_target_vector[t] != NULL; t++)
fprintf (f, " %s", bfd_target_vector[t]->name);
fprintf (f, "\n");
char *tmpname;
char *slash = strrchr (filename, '/');
-#if defined (__DJGPP__) || defined (__GO32__) || defined (_WIN32)
- if (slash == NULL)
- slash = strrchr (filename, '\\');
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
+ {
+ /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */
+ char *bslash = strrchr (filename, '\\');
+ if (slash == NULL || (bslash != NULL && bslash > slash))
+ slash = bslash;
+ if (slash == NULL && filename[0] != '\0' && filename[1] == ':')
+ slash = filename + 1;
+ }
#endif
if (slash != (char *) NULL)
c = *slash;
*slash = 0;
- tmpname = xmalloc (strlen (filename) + sizeof (template) + 1);
+ tmpname = xmalloc (strlen (filename) + sizeof (template) + 2);
strcpy (tmpname, filename);
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
+ /* If tmpname is "X:", appending a slash will make it a root
+ directory on drive X, which is NOT the same as the current
+ directory on drive X. */
+ if (tmpname[1] == ':' && tmpname[2] == '\0')
+ strcat (tmpname, ".");
+#endif
strcat (tmpname, "/");
strcat (tmpname, template);
mktemp (tmpname);
const char *end;
ret = bfd_scan_vma (s, &end, 0);
+
if (*end != '\0')
- {
- fprintf (stderr, "%s: %s: bad number: %s\n", program_name, arg, s);
- exit (1);
- }
+ fatal (_("%s: bad number: %s"), arg, s);
+
return ret;
}