2007-01-04 Paul Brook <[email protected]>

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

diff --git a/gas/input-file.c b/gas/input-file.c
index 5c23f31eacfb9abe1bde8df60d21a4041e2f4ab9..91ec53092278c13eed7530737d3f0948e6af4bc5 100644 (file)
--- a/gas/input-file.c
+++ b/gas/input-file.c
@@ -1,5 +1,6 @@
 /* input_file.c - Deal with Input Files -
-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001
+   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001,
+   2002, 2003, 2005, 2006
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -16,21 +17,19 @@
 
    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!  */
 
-#include <stdio.h>
-#include <string.h>
 #include "as.h"
 #include "input-file.h"
 #include "safe-ctype.h"
 
-static int input_file_get PARAMS ((char *, int));
+static int input_file_get (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.  */
@@ -58,37 +57,31 @@ struct saved_file
     char * app_save;
   };
 \f
-/* These hooks accomodate most operating systems.  */
+/* These hooks accommodate most operating systems.  */
 
 void
-input_file_begin ()
+input_file_begin (void)
 {
   f_in = (FILE *) 0;
 }
 
 void
-input_file_end ()
+input_file_end (void)
 {
 }
 
 /* Return BUFFER_SIZE.  */
 unsigned int
-input_file_buffer_size ()
+input_file_buffer_size (void)
 {
   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 *
-input_file_push ()
+input_file_push (void)
 {
   register struct saved_file *saved;
 
@@ -107,8 +100,7 @@ input_file_push ()
 }
 
 void
-input_file_pop (arg)
-     char *arg;
+input_file_pop (char *arg)
 {
   register struct saved_file *saved = (struct saved_file *) arg;
 
@@ -124,9 +116,8 @@ input_file_pop (arg)
 }
 \f
 void
-input_file_open (filename, pre)
-     char *filename;           /* "" means use stdin. Must not be 0.  */
-     int pre;
+input_file_open (char *filename, /* "" means use stdin. Must not be 0.  */
+                int pre)
 {
   int c;
   char buf[80];
@@ -135,23 +126,37 @@ input_file_open (filename, pre)
 
   assert (filename != 0);      /* Filename may not be NULL.  */
   if (filename[0])
-    {                          /* We have a file name. Suck it and see.  */
+    {
       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;
-      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);
+
+  if (ferror (f_in))
+    {
+      as_bad (_("can't read from %s: %s"),
+             file_name, xstrerror (errno));
+
+      fclose (f_in);
+      f_in = NULL;
+      return;
+    }
+
   if (c == '#')
     {
       /* Begins with comment, may not want to preprocess.  */
@@ -188,7 +193,7 @@ input_file_open (filename, pre)
 /* Close input file.  */
 
 void
-input_file_close ()
+input_file_close (void)
 {
   /* Don't close a null file pointer.  */
   if (f_in != NULL)
@@ -200,16 +205,14 @@ input_file_close ()
 /* This function is passed to do_scrub_chars.  */
 
 static int
-input_file_get (buf, buflen)
-     char *buf;
-     int buflen;
+input_file_get (char *buf, int buflen)
 {
   int size;
 
   size = fread (buf, sizeof (char), buflen, f_in);
   if (size < 0)
     {
-      as_perror (_("Can't read from %s"), file_name);
+      as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));
       size = 0;
     }
   return size;
@@ -218,8 +221,7 @@ input_file_get (buf, buflen)
 /* 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.  */
   register int size;
@@ -236,7 +238,7 @@ input_file_give_next_buffer (where)
     size = fread (where, sizeof (char), BUFFER_SIZE, f_in);
   if (size < 0)
     {
-      as_perror (_("Can't read from %s"), file_name);
+      as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));
       size = 0;
     }
   if (size)
@@ -244,7 +246,8 @@ input_file_give_next_buffer (where)
   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;
     }