ubsan: moxie: left shift of negative value

[deliverable/binutils-gdb.git] / gas / input-file.c

diff --git a/gas/input-file.c b/gas/input-file.c
index 798f327d0f573c9f64daf67a218443ee92825c53..79910b9d37a58ee9bdca27808d399cc7abec770d 100644 (file)
--- a/gas/input-file.c
+++ b/gas/input-file.c
@@ -1,12 +1,11 @@
 /* input_file.c - Deal with Input Files -
 /* input_file.c - Deal with Input Files -

-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright (C) 1987-2019 Free Software Foundation, Inc.

 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -16,22 +15,18 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free

-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 /* Confines all details of reading source bytes to this module.
    All O/S specific crocks should live here.
    What we lose in "efficiency" we gain in modularity.
    Note we don't need to #include the "as.h" file. No common coupling!  */
 
 
 /* Confines all details of reading source bytes to this module.
    All O/S specific crocks should live here.
    What we lose in "efficiency" we gain in modularity.
    Note we don't need to #include the "as.h" file. No common coupling!  */
 

-#include <stdio.h>
-#include <string.h>

 #include "as.h"
 #include "input-file.h"
 #include "safe-ctype.h"
 
 #include "as.h"
 #include "input-file.h"
 #include "safe-ctype.h"
 

-static int input_file_get PARAMS ((char *, int));
-

 /* This variable is non-zero if the file currently being read should be
    preprocessed by app.  It is zero if the file can be read straight in.  */
 int preprocess = 0;
 /* This variable is non-zero if the file currently being read should be
    preprocessed by app.  It is zero if the file can be read straight in.  */
 int preprocess = 0;


@@ -47,52 +42,46 @@ int preprocess = 0;
 /* We use static data: the data area is not sharable.  */
 
 static FILE *f_in;
 /* We use static data: the data area is not sharable.  */
 
 static FILE *f_in;

-static char *file_name;
+static const char *file_name;

 
 /* Struct for saving the state of this module for file includes.  */
 struct saved_file
   {
     FILE * f_in;
 
 /* Struct for saving the state of this module for file includes.  */
 struct saved_file
   {
     FILE * f_in;

-    char * file_name;
+    const char * file_name;

     int    preprocess;
     char * app_save;
   };
 \f
     int    preprocess;
     char * app_save;
   };
 \f

-/* These hooks accomodate most operating systems.  */
+/* These hooks accommodate most operating systems.  */

 
 void
 
 void

-input_file_begin ()
+input_file_begin (void)

 {
   f_in = (FILE *) 0;
 }
 
 void
 {
   f_in = (FILE *) 0;
 }
 
 void

-input_file_end ()
+input_file_end (void)

 {
 }
 
 /* Return BUFFER_SIZE.  */
 {
 }
 
 /* Return BUFFER_SIZE.  */

-unsigned int
-input_file_buffer_size ()
+size_t
+input_file_buffer_size (void)

 {
   return (BUFFER_SIZE);
 }
 
 {
   return (BUFFER_SIZE);
 }
 

-int
-input_file_is_open ()
-{
-  return f_in != (FILE *) 0;
-}
-

 /* Push the state of our input, returning a pointer to saved info that
    can be restored with input_file_pop ().  */
 
 char *
 /* Push the state of our input, returning a pointer to saved info that
    can be restored with input_file_pop ().  */
 
 char *

-input_file_push ()
+input_file_push (void)

 {
 {

-  register struct saved_file *saved;
+  struct saved_file *saved;

 
 

-  saved = (struct saved_file *) xmalloc (sizeof *saved);
+  saved = XNEW (struct saved_file);

 
   saved->f_in = f_in;
   saved->file_name = file_name;
 
   saved->f_in = f_in;
   saved->file_name = file_name;


@@ -107,10 +96,9 @@ input_file_push ()
 }
 
 void
 }
 
 void

-input_file_pop (arg)
-     char *arg;
+input_file_pop (char *arg)

 {
 {

-  register struct saved_file *saved = (struct saved_file *) arg;
+  struct saved_file *saved = (struct saved_file *) arg;

 
   input_file_end ();           /* Close out old file.  */
 
 
   input_file_end ();           /* Close out old file.  */
 


@@ -123,63 +111,87 @@ input_file_pop (arg)
   free (arg);
 }
 \f
   free (arg);
 }
 \f

+/* Open the specified file, "" means stdin.  Filename must not be null.  */
+

 void
 void

-input_file_open (filename, pre)
-     char *filename;           /* "" means use stdin. Must not be 0.  */
-     int pre;
+input_file_open (const char *filename,
+                int pre)

 {
   int c;
   char buf[80];
 
   preprocess = pre;
 
 {
   int c;
   char buf[80];
 
   preprocess = pre;
 

-  assert (filename != 0);      /* Filename may not be NULL.  */
+  gas_assert (filename != 0);  /* Filename may not be NULL.  */

   if (filename[0])
   if (filename[0])

-    {                          /* We have a file name. Suck it and see.  */
+    {

       f_in = fopen (filename, FOPEN_RT);
       file_name = filename;
     }
   else
       f_in = fopen (filename, FOPEN_RT);
       file_name = filename;
     }
   else

-    {                          /* use stdin for the input file.  */
+    {
+      /* Use stdin for the input file.  */

       f_in = stdin;
       f_in = stdin;

-      file_name = _("{standard input}");       /* For error messages.  */
+      /* For error messages.  */
+      file_name = _("{standard input}");

     }
     }

-  if (f_in == (FILE *) 0)
+
+  if (f_in == NULL)

     {
     {

-      as_bad (_("can't open %s for reading"), file_name);
-      as_perror ("%s", file_name);
+      as_bad (_("can't open %s for reading: %s"),
+             file_name, xstrerror (errno));

       return;
     }
 
   c = getc (f_in);
       return;
     }
 
   c = getc (f_in);

+
+  if (ferror (f_in))
+    {
+      as_bad (_("can't read from %s: %s"),
+             file_name, xstrerror (errno));
+
+      fclose (f_in);
+      f_in = NULL;
+      return;
+    }
+
+  /* Check for an empty input file.  */
+  if (feof (f_in))
+    {
+      fclose (f_in);
+      f_in = NULL;
+      return;
+    }
+  gas_assert (c != EOF);
+

   if (c == '#')
     {
       /* Begins with comment, may not want to preprocess.  */
       c = getc (f_in);
       if (c == 'N')
   if (c == '#')
     {
       /* Begins with comment, may not want to preprocess.  */
       c = getc (f_in);
       if (c == 'N')

-        {
-          fgets (buf, 80, f_in);
-          if (!strncmp (buf, "O_APP", 5) && ISSPACE (buf[5]))
-            preprocess = 0;
-          if (!strchr (buf, '\n'))
-            ungetc ('#', f_in);        /* It was longer.  */
-          else
-            ungetc ('\n', f_in);
-        }
+       {
+         if (fgets (buf, sizeof (buf), f_in)
+             && !strncmp (buf, "O_APP", 5) && ISSPACE (buf[5]))
+           preprocess = 0;
+         if (!strchr (buf, '\n'))
+           ungetc ('#', f_in); /* It was longer.  */
+         else
+           ungetc ('\n', f_in);
+       }

       else if (c == 'A')
       else if (c == 'A')

-        {
-          fgets (buf, 80, f_in);
-          if (!strncmp (buf, "PP", 2) && ISSPACE (buf[2]))
-            preprocess = 1;
-          if (!strchr (buf, '\n'))
-            ungetc ('#', f_in);
-          else
-            ungetc ('\n', f_in);
-        }
+       {
+         if (fgets (buf, sizeof (buf), f_in)
+             && !strncmp (buf, "PP", 2) && ISSPACE (buf[2]))
+           preprocess = 1;
+         if (!strchr (buf, '\n'))
+           ungetc ('#', f_in);
+         else
+           ungetc ('\n', f_in);
+       }

       else if (c == '\n')
       else if (c == '\n')

-        ungetc ('\n', f_in);
+       ungetc ('\n', f_in);

       else
       else

-        ungetc ('#', f_in);
+       ungetc ('#', f_in);

     }
   else
     ungetc (c, f_in);
     }
   else
     ungetc (c, f_in);


@@ -188,7 +200,7 @@ input_file_open (filename, pre)
 /* Close input file.  */
 
 void
 /* Close input file.  */
 
 void

-input_file_close ()
+input_file_close (void)

 {
   /* Don't close a null file pointer.  */
   if (f_in != NULL)
 {
   /* Don't close a null file pointer.  */
   if (f_in != NULL)


@@ -199,30 +211,27 @@ input_file_close ()
 
 /* This function is passed to do_scrub_chars.  */
 
 
 /* This function is passed to do_scrub_chars.  */
 

-static int
-input_file_get (buf, buflen)
-     char *buf;
-     int buflen;
+static size_t
+input_file_get (char *buf, size_t buflen)

 {
 {

-  int size;
+  size_t size;
+
+  if (feof (f_in))
+    return 0;

 
   size = fread (buf, sizeof (char), buflen, f_in);
 
   size = fread (buf, sizeof (char), buflen, f_in);

-  if (size < 0)
-    {
-      as_perror (_("Can't read from %s"), file_name);
-      size = 0;
-    }
+  if (ferror (f_in))
+    as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));

   return size;
 }
 
 /* Read a buffer from the input file.  */
 
 char *
   return size;
 }
 
 /* Read a buffer from the input file.  */
 
 char *

-input_file_give_next_buffer (where)
-     char *where;              /* Where to place 1st character of new buffer.  */
+input_file_give_next_buffer (char *where /* Where to place 1st character of new buffer.  */)

 {
   char *return_value;          /* -> Last char of what we read, + 1.  */
 {
   char *return_value;          /* -> Last char of what we read, + 1.  */

-  register int size;
+  size_t size;

 
   if (f_in == (FILE *) 0)
     return 0;
 
   if (f_in == (FILE *) 0)
     return 0;


@@ -233,18 +242,15 @@ input_file_give_next_buffer (where)
   if (preprocess)
     size = do_scrub_chars (input_file_get, where, BUFFER_SIZE);
   else
   if (preprocess)
     size = do_scrub_chars (input_file_get, where, BUFFER_SIZE);
   else

-    size = fread (where, sizeof (char), BUFFER_SIZE, f_in);
-  if (size < 0)
-    {
-      as_perror (_("Can't read from %s"), file_name);
-      size = 0;
-    }
+    size = input_file_get (where, BUFFER_SIZE);
+

   if (size)
     return_value = where + size;
   else
     {
       if (fclose (f_in))
   if (size)
     return_value = where + size;
   else
     {
       if (fclose (f_in))

-       as_perror (_("Can't close %s"), file_name);
+       as_warn (_("can't close %s: %s"), file_name, xstrerror (errno));
+

       f_in = (FILE *) 0;
       return_value = 0;
     }
       f_in = (FILE *) 0;
       return_value = 0;
     }