projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct changelog snafu.
[deliverable/binutils-gdb.git]
/
gas
/
input-file.c
diff --git
a/gas/input-file.c
b/gas/input-file.c
index 8e73615706783f1f297614cb3cb1c866f46e91a7..facd4d6613213c4543f523f02bd55e8de37bacfb 100644
(file)
--- a/
gas/input-file.c
+++ b/
gas/input-file.c
@@
-1,5
+1,6
@@
/* input_file.c - Deal with Input Files -
/* 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.
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
@@
-16,8
+17,8
@@
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
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, 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Software Foundation, 5
1 Franklin Street - Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
/* Confines all details of reading source bytes to this module.
All O/S specific crocks should live here.
/* Confines all details of reading source bytes to this module.
All O/S specific crocks should live here.
@@
-26,12
+27,12
@@
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
-#include <
sys/stat
.h>
+#include <
errno
.h>
#include "as.h"
#include "input-file.h"
#include "safe-ctype.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. */
/* 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. */
@@
-62,34
+63,28
@@
struct saved_file
/* These hooks accommodate most operating systems. */
void
/* These hooks accommodate most operating systems. */
void
-input_file_begin ()
+input_file_begin (
void
)
{
f_in = (FILE *) 0;
}
void
{
f_in = (FILE *) 0;
}
void
-input_file_end ()
+input_file_end (
void
)
{
}
/* Return BUFFER_SIZE. */
unsigned int
{
}
/* Return BUFFER_SIZE. */
unsigned int
-input_file_buffer_size ()
+input_file_buffer_size (
void
)
{
return (BUFFER_SIZE);
}
{
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 *
/* 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;
{
register struct saved_file *saved;
@@
-108,8
+103,7
@@
input_file_push ()
}
void
}
void
-input_file_pop (arg)
- char *arg;
+input_file_pop (char *arg)
{
register struct saved_file *saved = (struct saved_file *) arg;
{
register struct saved_file *saved = (struct saved_file *) arg;
@@
-125,9
+119,8
@@
input_file_pop (arg)
}
\f
void
}
\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];
{
int c;
char buf[80];
@@
-137,19
+130,6
@@
input_file_open (filename, pre)
assert (filename != 0); /* Filename may not be NULL. */
if (filename[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;
}
f_in = fopen (filename, FOPEN_RT);
file_name = filename;
}
@@
-161,14
+141,29
@@
input_file_open (filename, pre)
file_name = _("{standard input}");
}
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);
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. */
if (c == '#')
{
/* Begins with comment, may not want to preprocess. */
@@
-205,7
+200,7
@@
input_file_open (filename, pre)
/* Close input file. */
void
/* Close input file. */
void
-input_file_close ()
+input_file_close (
void
)
{
/* Don't close a null file pointer. */
if (f_in != NULL)
{
/* Don't close a null file pointer. */
if (f_in != NULL)
@@
-217,15
+212,16
@@
input_file_close ()
/* This function is passed to do_scrub_chars. */
static int
/* 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)
{
{
int size;
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;
}
as_perror (_("Can't read from %s"), file_name);
size = 0;
}
@@
-235,8
+231,7
@@
input_file_get (buf, buflen)
/* Read a buffer from the input file. */
char *
/* 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;
{
char *return_value; /* -> Last char of what we read, + 1. */
register int size;
@@
-253,6
+248,9
@@
input_file_give_next_buffer (where)
size = fread (where, sizeof (char), BUFFER_SIZE, f_in);
if (size < 0)
{
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;
}
as_perror (_("Can't read from %s"), file_name);
size = 0;
}
@@
-261,7
+259,12
@@
input_file_give_next_buffer (where)
else
{
if (fclose (f_in))
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;
}
f_in = (FILE *) 0;
return_value = 0;
}
This page took
0.026018 seconds
and
4
git commands to generate.