Accept 16-bit addresses.

[deliverable/binutils-gdb.git] / binutils / bucomm.c

diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index 6b4223c2b9fb47551b75772f06f060f09c382ef2..a5b0054887aaeaf38bd01c99a56f1686d877db68 100644 (file)
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -1,5 +1,5 @@
 /* bucomm.c -- Bin Utils COMmon code.
-   Copyright (C) 1991, 92, 93, 94, 95, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1991, 92, 93, 94, 95, 1997, 1998 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -39,8 +39,6 @@ typedef long time_t;
 #else
 #include <varargs.h>
 #endif
-
-char *target = NULL;           /* default as late as possible */
 \f
 /* Error reporting */
 
@@ -66,19 +64,37 @@ bfd_fatal (string)
   xexit (1);
 }
 
+static 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)
@@ -87,14 +103,25 @@ 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
@@ -109,13 +136,8 @@ set_default_bfd_target ()
   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
@@ -126,10 +148,10 @@ void
 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.  */
@@ -143,9 +165,9 @@ list_supported_targets (name, f)
   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");
@@ -236,10 +258,9 @@ parse_vma (s, arg)
   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;
 }