projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdb/
[deliverable/binutils-gdb.git]
/
gas
/
input-file.c
diff --git
a/gas/input-file.c
b/gas/input-file.c
index 343f0494087c320da30c4ed6ce537671bc49aca3..a864e4bdc812744b97d27c668ae47ab11726a74c 100644
(file)
--- a/
gas/input-file.c
+++ b/
gas/input-file.c
@@
-1,13
+1,13
@@
/* input_file.c - Deal with Input Files -
Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001,
/* input_file.c - Deal with Input Files -
Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001,
- 2002, 2003, 2005
+ 2002, 2003, 2005
, 2006, 2007, 2009, 2012
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
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,
any later version.
GAS is distributed in the hope that it will be useful,
@@
-25,15
+25,10
@@
What we lose in "efficiency" we gain in modularity.
Note we don't need to #include the "as.h" file. No common coupling! */
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"
#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;
/* 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;
@@
-74,7
+69,7
@@
input_file_end (void)
}
/* Return BUFFER_SIZE. */
}
/* Return BUFFER_SIZE. */
-
unsigned in
t
+
size_
t
input_file_buffer_size (void)
{
return (BUFFER_SIZE);
input_file_buffer_size (void)
{
return (BUFFER_SIZE);
@@
-127,7
+122,7
@@
input_file_open (char *filename, /* "" means use stdin. Must not be 0. */
preprocess = pre;
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);
if (filename[0])
{
f_in = fopen (filename, FOPEN_RT);
@@
-143,8
+138,8
@@
input_file_open (char *filename, /* "" means use stdin. Must not be 0. */
if (f_in == NULL)
{
if (f_in == NULL)
{
- bfd_set_error (bfd_error_system_call);
-
as_perror (_("Can't open %s for reading"), file_name
);
+ as_bad (_("can't open %s for reading: %s"),
+
file_name, xstrerror (errno)
);
return;
}
return;
}
@@
-152,22
+147,31
@@
input_file_open (char *filename, /* "" means use stdin. Must not be 0. */
if (ferror (f_in))
{
if (ferror (f_in))
{
- bfd_set_error (bfd_error_system_call);
-
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;
}
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')
{
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. */
preprocess = 0;
if (!strchr (buf, '\n'))
ungetc ('#', f_in); /* It was longer. */
@@
-176,8
+180,8
@@
input_file_open (char *filename, /* "" means use stdin. Must not be 0. */
}
else if (c == 'A')
{
}
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);
preprocess = 1;
if (!strchr (buf, '\n'))
ungetc ('#', f_in);
@@
-207,18
+211,17
@@
input_file_close (void)
/* This function is passed to do_scrub_chars. */
/* This function is passed to do_scrub_chars. */
-static
in
t
-input_file_get (char *buf,
in
t buflen)
+static
size_
t
+input_file_get (char *buf,
size_
t buflen)
{
{
-
in
t size;
+
size_
t size;
+ if (feof (f_in))
+ return 0;
+
size = fread (buf, sizeof (char), buflen, f_in);
size = fread (buf, sizeof (char), buflen, f_in);
- if (size < 0)
- {
- bfd_set_error (bfd_error_system_call);
- 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;
}
return size;
}
@@
-228,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. */
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 in
t size;
+
size_
t size;
if (f_in == (FILE *) 0)
return 0;
if (f_in == (FILE *) 0)
return 0;
@@
-239,22
+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
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)
- {
- bfd_set_error (bfd_error_system_call);
- 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))
if (size)
return_value = where + size;
else
{
if (fclose (f_in))
- {
- bfd_set_error (bfd_error_system_call);
- 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;
}
f_in = (FILE *) 0;
return_value = 0;
}
This page took
0.027292 seconds
and
4
git commands to generate.