diff options
| author | Paul Brook <pbrook@gcc.gnu.org> | 2004-08-31 20:37:43 +0000 |
|---|---|---|
| committer | Paul Brook <pbrook@gcc.gnu.org> | 2004-08-31 20:37:43 +0000 |
| commit | 334ff453eaa61a47ee9b45b273a0a8057697060e (patch) | |
| tree | dc7a4ca767a0ceaea51b4b9fda68b21315cdcfa6 /libgfortran | |
| parent | af287697443400b33dbfd2297bdcf63121e7bc86 (diff) | |
| download | gcc-334ff453eaa61a47ee9b45b273a0a8057697060e.tar.gz | |
re PR libfortran/16805 (Runtime failure using list directed read from string)
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.
testsuite/
2004-08-31 Bud Davis <bdavis9659@comcast.net>
* gfortran.dg/list_read_2.f90: New test.
From-SVN: r86844
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 83e03388269..50ad7a6290f 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 8b00a5e296e..f47d473df91 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 33d7fda4514..377cadd438e 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; |