diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 13 | ||||
| -rw-r--r-- | libgfortran/io/unix.c | 3 |
3 files changed, 17 insertions, 5 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 83e0338..50ad7a6 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2004-08-31 Paul Brook <paul@codesourcery.com> + + PR libfortran/16805 + * io/list_read.c (next_char): Don't signal EOF for internal files. + * io/unix.c (mem_alloc_r_at): Don't return NULL for incomplete reads. + 2004-08-31 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> * io/unit.c: Separate copyright years by ','. diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index 8b00a5e..f47d473 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -142,8 +142,17 @@ next_char (void) } if (length == 0) - longjmp (g.eof_jump, 1); - c = *p; + { + /* For internal files return a newline instead of signalling EOF. */ + /* ??? This isn't quite right, but we don't handle internal files + with multiple records. */ + if (is_internal_unit ()) + c = '\n'; + else + longjmp (g.eof_jump, 1); + } + else + c = *p; done: at_eol = (c == '\n'); diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index 33d7fda..377cadd 100644 --- a/libgfortran/io/unix.c +++ b/libgfortran/io/unix.c @@ -746,9 +746,6 @@ mem_alloc_r_at (unix_stream * s, int *len, gfc_offset where) if (where < s->buffer_offset || where > s->buffer_offset + s->active) return NULL; - if (is_internal_unit() && where + *len > s->file_length) - return NULL; - s->logical_offset = where + *len; n = s->buffer_offset + s->active - where; |