daily update

[deliverable/binutils-gdb.git] / bfd / vms-hdr.c

diff --git a/bfd/vms-hdr.c b/bfd/vms-hdr.c
index d5477535e7013cd396bd774a9ee0e0b095849a15..c2611115a9063e19916803e3a5d1063ae7f95e5e 100644 (file)
--- a/bfd/vms-hdr.c
+++ b/bfd/vms-hdr.c
@@ -1,6 +1,7 @@
 /* vms-hdr.c -- BFD back-end for VMS/VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
    HDR record handling functions
    EMH record handling functions
@@ -24,11 +25,11 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include <ctype.h>
-
 #include "bfd.h"
+#include "bfdver.h"
 #include "sysdep.h"
 #include "bfdlink.h"
+#include "safe-ctype.h"
 #include "libbfd.h"
 
 #include "vms.h"
@@ -36,6 +37,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
+
+static unsigned char *get_vms_time_string PARAMS ((void));
+
+
 /*---------------------------------------------------------------------------*/
 
 /* Read & process emh record
@@ -201,7 +206,7 @@ _bfd_vms_slurp_hdr (abfd, objtype)
 /*-----------------------------------------------------------------------------*/
 /* Output routines.  */
 
-/* Manufacure a VMS like time on a unix based system.
+/* Manufacture a VMS like time on a unix based system.
    stolen from obj-vms.c  */
 
 static unsigned char *
@@ -299,8 +304,7 @@ _bfd_vms_write_hdr (abfd, objtype)
       fptr = fout;
       while (*fptr != 0)
        {
-         if (islower (*fptr))
-           *fptr = toupper (*fptr);
+         *fptr = TOUPPER (*fptr);
          fptr++;
          if ((*fptr == ';')
             || ((fptr - fout) > 31))
@@ -311,7 +315,7 @@ _bfd_vms_write_hdr (abfd, objtype)
   else
     _bfd_vms_output_counted (abfd, "NONAME");
 
-  _bfd_vms_output_counted (abfd, BFD_VERSION);
+  _bfd_vms_output_counted (abfd, BFD_VERSION_STRING);
   _bfd_vms_output_dump (abfd, get_vms_time_string (), 17);
   _bfd_vms_output_fill (abfd, 0, 17);
   _bfd_vms_output_flush (abfd);
@@ -343,7 +347,8 @@ _bfd_vms_write_hdr (abfd, objtype)
              continue;
            }
 
-         _bfd_vms_output_dump (abfd, (unsigned char *)symbol->name, strlen (symbol->name));
+         _bfd_vms_output_dump (abfd, (unsigned char *) symbol->name,
+                               (int) strlen (symbol->name));
          if (had_case)
            break;
          had_file = 1;
@@ -404,10 +409,10 @@ _bfd_vms_slurp_eom (abfd, objtype)
          bfd_set_error (bfd_error_bad_value);
          return -1;
        }
-      PRIV(eom_data).eom_has_transfer = false;
+      PRIV(eom_data).eom_has_transfer = FALSE;
       if (PRIV(rec_size) > 10)
        {
-          PRIV(eom_data).eom_has_transfer = true;
+          PRIV(eom_data).eom_has_transfer = TRUE;
           PRIV(eom_data).eom_b_tfrflg = *(vms_rec + 9);
           PRIV(eom_data).eom_l_psindx = bfd_getl32 (vms_rec + 12);
           PRIV(eom_data).eom_l_tfradr = bfd_getl32 (vms_rec + 16);