merge from gcc

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

diff --git a/gas/input-file.c b/gas/input-file.c
index 5ada6304b1513c0212da17519962c2f58898e16f..a8fc9e5f21847a353f842ef59f1d179b42c5d6ab 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
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -26,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <sys/stat.h>
+#include <errno.h>
 #include "as.h"
 #include "input-file.h"
 #include "safe-ctype.h"
@@ -135,19 +136,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 +147,29 @@ 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);
+#ifdef BFD_ASSEMBLER
+      bfd_set_error (bfd_error_system_call);
+#endif
+      as_perror (_("Can't open %s for reading"), file_name);
       return;
     }
 
   c = getc (f_in);
+
+  if (ferror (f_in))
+    {
+#ifdef BFD_ASSEMBLER
+      bfd_set_error (bfd_error_system_call);
+#endif
+      as_perror (_("Can't open %s for reading"), file_name);
+
+      fclose (f_in);
+      f_in = NULL;
+      return;
+    }
+
   if (c == '#')
     {
       /* Begins with comment, may not want to preprocess.  */
@@ -222,6 +225,9 @@ input_file_get (char *buf, int buflen)
   size = fread (buf, sizeof (char), buflen, f_in);
   if (size < 0)
     {
+#ifdef BFD_ASSEMBLER
+      bfd_set_error (bfd_error_system_call);
+#endif
       as_perror (_("Can't read from %s"), file_name);
       size = 0;
     }
@@ -248,6 +254,9 @@ 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)
     {
+#ifdef BFD_ASSEMBLER
+      bfd_set_error (bfd_error_system_call);
+#endif
       as_perror (_("Can't read from %s"), file_name);
       size = 0;
     }
@@ -256,7 +265,12 @@ 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);
+       {
+#ifdef BFD_ASSEMBLER
+         bfd_set_error (bfd_error_system_call);
+#endif
+         as_perror (_("Can't close %s"), file_name);
+       }
       f_in = (FILE *) 0;
       return_value = 0;
     }