diff options
Diffstat (limited to 'contrib/binutils/gas/input-file.c')
| -rw-r--r-- | contrib/binutils/gas/input-file.c | 67 |
1 files changed, 25 insertions, 42 deletions
diff --git a/contrib/binutils/gas/input-file.c b/contrib/binutils/gas/input-file.c index 01cc669..0907bad 100644 --- a/contrib/binutils/gas/input-file.c +++ b/contrib/binutils/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 <errno.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 (). */ @@ -146,21 +138,22 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0. */ file_name = _("{standard input}"); } - if (f_in) - c = getc (f_in); + if (f_in == NULL) + { + as_bad (_("can't open %s for reading: %s"), + file_name, xstrerror (errno)); + return; + } + + c = getc (f_in); - if (f_in == NULL || ferror (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); + as_bad (_("can't read from %s: %s"), + file_name, xstrerror (errno)); - if (f_in) - { - fclose (f_in); - f_in = NULL; - } + fclose (f_in); + f_in = NULL; return; } @@ -170,8 +163,8 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0. */ c = getc (f_in); if (c == 'N') { - fgets (buf, 80, f_in); - if (!strncmp (buf, "O_APP", 5) && ISSPACE (buf[5])) + 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. */ @@ -180,8 +173,8 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0. */ } else if (c == 'A') { - fgets (buf, 80, f_in); - if (!strncmp (buf, "PP", 2) && ISSPACE (buf[2])) + if (fgets (buf, sizeof (buf), f_in) + && !strncmp (buf, "PP", 2) && ISSPACE (buf[2])) preprocess = 1; if (!strchr (buf, '\n')) ungetc ('#', f_in); @@ -219,10 +212,7 @@ 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); + as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno)); size = 0; } return size; @@ -248,10 +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) { -#ifdef BFD_ASSEMBLER - bfd_set_error (bfd_error_system_call); -#endif - 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) @@ -259,12 +246,8 @@ input_file_give_next_buffer (char *where /* Where to place 1st character of new else { if (fclose (f_in)) - { -#ifdef BFD_ASSEMBLER - bfd_set_error (bfd_error_system_call); -#endif - 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; } |
