projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cast literal to char * when assigning to input_line_ptr
[deliverable/binutils-gdb.git]
/
gas
/
input-file.c
diff --git
a/gas/input-file.c
b/gas/input-file.c
index ec36a4269649faa968f43ef5e153a58f2bfa9990..a3dcd9d2f89c291382368706ce0ee51c65bef223 100644
(file)
--- a/
gas/input-file.c
+++ b/
gas/input-file.c
@@
-1,13
+1,11
@@
/* 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,
- 2002, 2003, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1987-2016 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
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,
@@
-29,8
+27,6
@@
#include "input-file.h"
#include "safe-ctype.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;
@@
-46,13
+42,13
@@
int preprocess = 0;
/* We use static data: the data area is not sharable. */
static FILE *f_in;
/* We use static data: the data area is not sharable. */
static FILE *f_in;
-static char *file_name;
+static c
onst c
har *file_name;
/* Struct for saving the state of this module for file includes. */
struct saved_file
{
FILE * f_in;
/* Struct for saving the state of this module for file includes. */
struct saved_file
{
FILE * f_in;
- char * file_name;
+ c
onst c
har * file_name;
int preprocess;
char * app_save;
};
int preprocess;
char * app_save;
};
@@
-71,7
+67,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);
@@
-83,7
+79,7
@@
input_file_buffer_size (void)
char *
input_file_push (void)
{
char *
input_file_push (void)
{
-
register
struct saved_file *saved;
+ struct saved_file *saved;
saved = (struct saved_file *) xmalloc (sizeof *saved);
saved = (struct saved_file *) xmalloc (sizeof *saved);
@@
-102,7
+98,7
@@
input_file_push (void)
void
input_file_pop (char *arg)
{
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. */
input_file_end (); /* Close out old file. */
@@
-115,8
+111,10
@@
input_file_pop (char *arg)
free (arg);
}
\f
free (arg);
}
\f
+/* Open the specified file, "" means stdin. Filename must not be null. */
+
void
void
-input_file_open (c
har *filename, /* "" means use stdin. Must not be 0. */
+input_file_open (c
onst char *filename,
int pre)
{
int c;
int pre)
{
int c;
@@
-124,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);
@@
-157,14
+155,23
@@
input_file_open (char *filename, /* "" means use stdin. Must not be 0. */
return;
}
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. */
@@
-173,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);
@@
-204,17
+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)
{
{
- int 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)
- {
- as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));
- size = 0;
- }
+ if (ferror (f_in))
+ as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));
return size;
}
return size;
}
@@
-224,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;
@@
-235,18
+242,14
@@
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)
- {
- as_bad (_("can't read from %s: %s"), file_name, xstrerror (errno));
- 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))
- as_
bad
(_("can't close %s: %s"), file_name, xstrerror (errno));
+ 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.025071 seconds
and
4
git commands to generate.