X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Finput-file.c;h=79910b9d37a58ee9bdca27808d399cc7abec770d;hb=228c8f4be0c428369ec6b68e25696863d1e62ed7;hp=a8fc9e5f21847a353f842ef59f1d179b42c5d6ab;hpb=2da5c03714e1f97bb83d05114e97dcf92eb17b64;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/input-file.c b/gas/input-file.c index a8fc9e5f21..79910b9d37 100644 --- a/gas/input-file.c +++ b/gas/input-file.c @@ -1,13 +1,11 @@ /* input_file.c - Deal with Input Files - - Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, - 2002, 2003, 2005 - 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 - 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, @@ -17,23 +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 - 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 -#include -#include #include "as.h" #include "input-file.h" #include "safe-ctype.h" -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. */ int preprocess = 0; @@ -49,13 +42,13 @@ int preprocess = 0; /* 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; - char * file_name; + const char * file_name; int preprocess; char * app_save; }; @@ -74,27 +67,21 @@ input_file_end (void) } /* Return BUFFER_SIZE. */ -unsigned int +size_t 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 (). */ char * 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; @@ -111,7 +98,7 @@ input_file_push (void) void 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. */ @@ -124,8 +111,10 @@ input_file_pop (char *arg) free (arg); } +/* Open the specified file, "" means stdin. Filename must not be null. */ + void -input_file_open (char *filename, /* "" means use stdin. Must not be 0. */ +input_file_open (const char *filename, int pre) { int c; @@ -133,7 +122,7 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0. */ preprocess = pre; - assert (filename != 0); /* Filename may not be NULL. */ + gas_assert (filename != 0); /* Filename may not be NULL. */ if (filename[0]) { f_in = fopen (filename, FOPEN_RT); @@ -149,10 +138,8 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0. */ if (f_in == NULL) { -#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 open %s for reading: %s"), + file_name, xstrerror (errno)); return; } @@ -160,24 +147,31 @@ input_file_open (char *filename, /* "" means use stdin. Must not be 0. */ 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)); 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') { - 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. */ @@ -186,8 +180,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); @@ -217,20 +211,17 @@ input_file_close (void) /* This function is passed to do_scrub_chars. */ -static int -input_file_get (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); - 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; - } + if (ferror (f_in)) + as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno)); return size; } @@ -240,7 +231,7 @@ char * 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; + size_t size; if (f_in == (FILE *) 0) return 0; @@ -251,26 +242,15 @@ input_file_give_next_buffer (char *where /* Where to place 1st character of new 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) - { -#ifdef BFD_ASSEMBLER - bfd_set_error (bfd_error_system_call); -#endif - 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)) - { -#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; }