* v850-opc.c (v850_operands): Add "B3" support.

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

diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index 44011663b9be33c5bb59d1e8dce9571a252d54ed..24d5707d0931c5f4f08d309b17eb473323b3de03 100644 (file)
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -1,5 +1,5 @@
 /* bucomm.c -- Bin Utils COMmon code.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Copyright (C) 1991, 92, 93, 94 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -22,24 +22,26 @@
 
 #include "bfd.h"
 #include "sysdep.h"
+#include "libiberty.h"
+#include "bucomm.h"
+
+#ifdef ANSI_PROTOTYPES
+#include <stdarg.h>
+#else
 #include <varargs.h>
+#endif
 
 char *target = NULL;           /* default as late as possible */
-
-/* Yes, this is what atexit is for, but that isn't guaranteed yet.
-   And yes, I know this isn't as good, but it does what is needed just fine. */
-void (*exit_handler) ();
-
-
+\f
 /* Error reporting */
 
 char *program_name;
 
 void
 bfd_nonfatal (string)
-     char *string;
+     CONST char *string;
 {
-  CONST char *errmsg = bfd_errmsg (bfd_error);
+  CONST char *errmsg = bfd_errmsg (bfd_get_error ());
 
   if (string)
     fprintf (stderr, "%s: %s: %s\n", program_name, string, errmsg);
@@ -49,30 +51,24 @@ bfd_nonfatal (string)
 
 void
 bfd_fatal (string)
-     char *string;
+     CONST char *string;
 {
   bfd_nonfatal (string);
-
-  if (NULL != exit_handler)
-    (*exit_handler) ();
-  exit (1);
+  xexit (1);
 }
 
-#if 0                          /* !defined(NO_STDARG) */
+#ifdef ANSI_PROTOTYPES
 void
-fatal (Format)
-     const char *Format;
+fatal (const char *format, ...)
 {
   va_list args;
 
   fprintf (stderr, "%s: ", program_name);
-  va_start (args, Format);
-  vfprintf (stderr, Format, args);
+  va_start (args, format);
+  vfprintf (stderr, format, args);
   va_end (args);
   putc ('\n', stderr);
-  if (NULL != exit_handler)
-    (*exit_handler) ();
-  exit (1);
+  xexit (1);
 }
 #else
 void 
@@ -88,15 +84,43 @@ fatal (va_alist)
   vfprintf (stderr, Format, args);
   va_end (args);
   putc ('\n', stderr);
-  if (NULL != exit_handler)
-    (*exit_handler) ();
-  exit (1);
+  xexit (1);
 }
 #endif
-\f
 
-void mode_string ();
+/* After a false return from bfd_check_format_matches with
+   bfd_get_error () == bfd_error_file_ambiguously_recognized, print the possible
+   matching targets.  */
 
+void
+list_matching_formats (p)
+     char **p;
+{
+  fprintf(stderr, "%s: Matching formats:", program_name);
+  while (*p)
+    fprintf(stderr, " %s", *p++);
+  fprintf(stderr, "\n");
+}
+
+/* List the supported targets.  */
+
+void
+list_supported_targets (name, f)
+     const char *name;
+     FILE *f;
+{
+  extern bfd_target *bfd_target_vector[];
+  int t;
+
+  if (name == NULL)
+    fprintf (f, "Supported targets:");
+  else
+    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");
+}
+\f
 /* Display the archive header for an element as if it were an ls -l listing:
 
    Mode       User\tGroup\tSize\tDate               Name */
@@ -115,7 +139,7 @@ print_arelt_descr (file, abfd, verbose)
        {
          char modebuf[11];
          char timebuf[40];
-         long when = buf.st_mtime;
+         time_t when = buf.st_mtime;
          CONST char *ctime_result = (CONST char *) ctime (&when);
 
          /* POSIX format:  skip weekday and seconds from ctime output.  */
@@ -124,10 +148,11 @@ print_arelt_descr (file, abfd, verbose)
          mode_string (buf.st_mode, modebuf);
          modebuf[10] = '\0';
          /* POSIX 1003.2/D11 says to skip first character (entry type).  */
-         fprintf (file, "%s %d/%d %6ld %s ", modebuf + 1,
-                  buf.st_uid, buf.st_gid, buf.st_size, timebuf);
+         fprintf (file, "%s %ld/%ld %6ld %s ", modebuf + 1,
+                  (long) buf.st_uid, (long) buf.st_gid,
+                  (long) buf.st_size, timebuf);
        }
     }
 
-  fprintf (file, "%s\n", abfd->filename);
+  fprintf (file, "%s\n", bfd_get_filename (abfd));
 }