PR gas/3165

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

diff --git a/gas/input-file.c b/gas/input-file.c
index 5ada6304b1513c0212da17519962c2f58898e16f..ec36a4269649faa968f43ef5e153a58f2bfa9990 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, 2003
+   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,17 +17,14 @@
 
    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 <sys/stat.h>
 #include "as.h"
 #include "input-file.h"
 #include "safe-ctype.h"
@@ -79,12 +77,6 @@ input_file_buffer_size (void)
   return (BUFFER_SIZE);
 }
 
-int
-input_file_is_open (void)
-{
-  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 ().  */
 
@@ -135,19 +127,6 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0.  */
   assert (filename != 0);      /* Filename may not be NULL.  */
   if (filename[0])
     {
-      struct stat statbuf;
-
-      if (stat (filename, &statbuf) < 0)
-       {
-         as_bad (_("%s: No such file"), filename);
-         return;
-       }
-      else if (! S_ISREG (statbuf.st_mode))
-       {
-         as_bad (_("'%s' is not an ordinary file"), filename);
-         return;
-       }
-
       f_in = fopen (filename, FOPEN_RT);
       file_name = filename;
     }
@@ -159,14 +138,25 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0.  */
       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.  */
@@ -222,7 +212,7 @@ input_file_get (char *buf, int buflen)
   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;
@@ -248,7 +238,7 @@ input_file_give_next_buffer (char *where /* Where to place 1st character of new
     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)
@@ -256,7 +246,8 @@ input_file_give_next_buffer (char *where /* Where to place 1st character of new
   else
     {
       if (fclose (f_in))
-       as_perror (_("Can't close %s"), file_name);
+       as_bad (_("can't close %s: %s"), file_name, xstrerror (errno));
+
       f_in = (FILE *) 0;
       return_value = 0;
     }