diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2000-11-03 16:03:37 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2000-11-03 16:03:37 +0000 |
| commit | def3263a3364034c8cd6cd865975529f9fd80e69 (patch) | |
| tree | b3e2c442f061fc7379989b80f9d5ee2b7118618f /gcc | |
| parent | 30235724a2cd237a613883e9c4149f979acb91ea (diff) | |
| download | gcc-def3263a3364034c8cd6cd865975529f9fd80e69.zip gcc-def3263a3364034c8cd6cd865975529f9fd80e69.tar.gz gcc-def3263a3364034c8cd6cd865975529f9fd80e69.tar.bz2 | |
cppfiles.c (open_file): If already read, then don't reopen.
* cppfiles.c (open_file): If already read, then don't reopen.
Immediately close an empty file.
From-SVN: r37227
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cppfiles.c | 16 |
2 files changed, 17 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d2414dc..0ad0e51 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-11-03 Nathan Sidwell <nathan@codesourcery.com> + + * cppfiles.c (open_file): If already read, then don't reopen. + Immediately close an empty file. + 2000-11-01 Bernd Schmidt <bernds@redhat.co.uk> * expr.h (fold_builtin): Move declaration... diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index 1009fa7..47bf43f 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -145,9 +145,13 @@ open_file (pfile, filename) if (file->fd == -2) return 0; - /* -1 indicates a file we've opened previously, and since closed. */ - if (file->fd != -1) - return file; + /* Don't reopen an idempotent file. */ + if (DO_NOT_REREAD (file)) + return file; + + /* Don't reopen one which is already loaded. */ + if (file->buffer != NULL) + return file; } else { @@ -181,7 +185,11 @@ open_file (pfile, filename) { /* Mark a regular, zero-length file never-reread now. */ if (S_ISREG (file->st.st_mode) && file->st.st_size == 0) - file->cmacro = NEVER_REREAD; + { + file->cmacro = NEVER_REREAD; + close (file->fd); + file->fd = -1; + } return file; } |