* bucomm.c: Replace CONST with const.

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

diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index a5b0054887aaeaf38bd01c99a56f1686d877db68..35112fc71661ae6973d6d75d22a7a629c238c53b 100644 (file)
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -1,5 +1,6 @@
 /* bucomm.c -- Bin Utils COMmon code.
-   Copyright (C) 1991, 92, 93, 94, 95, 1997, 1998 Free Software Foundation, Inc.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -24,6 +25,7 @@
 #include "bfd.h"
 #include "libiberty.h"
 #include "bucomm.h"
+#include "filenames.h"
 
 #include <sys/stat.h>
 #include <time.h>              /* ctime, maybe time_t */
@@ -33,12 +35,6 @@
 typedef long time_t;
 #endif
 #endif
-
-#ifdef ANSI_PROTOTYPES
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 \f
 /* Error reporting */
 
@@ -46,9 +42,9 @@ char *program_name;
 
 void
 bfd_nonfatal (string)
-     CONST char *string;
+     const char *string;
 {
-  CONST char *errmsg = bfd_errmsg (bfd_get_error ());
+  const char *errmsg = bfd_errmsg (bfd_get_error ());
 
   if (string)
     fprintf (stderr, "%s: %s: %s\n", program_name, string, errmsg);
@@ -58,13 +54,13 @@ bfd_nonfatal (string)
 
 void
 bfd_fatal (string)
-     CONST char *string;
+     const char *string;
 {
   bfd_nonfatal (string);
   xexit (1);
 }
 
-static void
+void
 report (format, args)
      const char * format;
      va_list args;
@@ -74,56 +70,27 @@ report (format, args)
   putc ('\n', stderr);
 }
 
-#ifdef ANSI_PROTOTYPES
 void
-fatal (const char *format, ...)
+fatal VPARAMS ((const char *format, ...))
 {
-  va_list args;
+  VA_OPEN (args, format);
+  VA_FIXEDARG (args, const char *, format);
 
-  va_start (args, format);
   report (format, args);
-  va_end (args);
+  VA_CLOSE (args);
   xexit (1);
 }
 
 void
-non_fatal (const char *format, ...)
+non_fatal VPARAMS ((const char *format, ...))
 {
-  va_list args;
+  VA_OPEN (args, format);
+  VA_FIXEDARG (args, const char *, format);
 
-  va_start (args, format);
   report (format, args);
-  va_end (args);
-}
-#else
-void 
-fatal (va_alist)
-     va_dcl
-{
-  char *Format;
-  va_list args;
-
-  va_start (args);
-  Format = va_arg (args, char *);
-  report (Format, args);
-  va_end (args);
-  xexit (1);
+  VA_CLOSE (args);
 }
 
-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
    this permits the binutils to be configured for a particular target,
    and linked against a shared BFD library which was configured for a
@@ -161,7 +128,7 @@ list_supported_targets (name, f)
      const char *name;
      FILE *f;
 {
-  extern bfd_target *bfd_target_vector[];
+  extern const bfd_target *const *bfd_target_vector;
   int t;
 
   if (name == NULL)
@@ -172,6 +139,25 @@ list_supported_targets (name, f)
     fprintf (f, " %s", bfd_target_vector[t]->name);
   fprintf (f, "\n");
 }
+
+/* List the supported architectures.  */
+
+void
+list_supported_architectures (name, f)
+     const char *name;
+     FILE *f;
+{
+  const char** arch;
+
+  if (name == NULL)
+    fprintf (f, _("Supported architectures:"));
+  else
+    fprintf (f, _("%s: supported architectures:"), name);
+
+  for (arch = bfd_arch_list (); *arch; arch++)
+    fprintf (f, " %s", *arch);
+  fprintf (f, "\n");
+}
 \f
 /* Display the archive header for an element as if it were an ls -l listing:
 
@@ -192,7 +178,7 @@ print_arelt_descr (file, abfd, verbose)
          char modebuf[11];
          char timebuf[40];
          time_t when = buf.st_mtime;
-         CONST char *ctime_result = (CONST char *) ctime (&when);
+         const char *ctime_result = (const char *) ctime (&when);
 
          /* POSIX format:  skip weekday and seconds from ctime output.  */
          sprintf (timebuf, "%.12s %.4s", ctime_result + 4, ctime_result + 20);
@@ -219,9 +205,15 @@ make_tempname (filename)
   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)
@@ -230,8 +222,15 @@ make_tempname (filename)
 
       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);
@@ -258,7 +257,7 @@ parse_vma (s, arg)
   const char *end;
 
   ret = bfd_scan_vma (s, &end, 0);
-  
+
   if (*end != '\0')
     fatal (_("%s: bad number: %s"), arg, s);