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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5e8be36c6367203b0f181becd131f68260f33251..10dd9bf3c1dd95dec267892b58f523e718a2f872 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-31  Bud Davis  <bdavis9659@comcast.net>
+
+       PR libfortran/16805
+       * gfortran.dg/list_read_2.f90: New test.
+
 2004-08-31  Mark Mitchell  <mark@codesourcery.com>
 
        * g++.dg/abi/key1.C: New test.

diff --git a/gcc/testsuite/gfortran.dg/list_read_2.f90 b/gcc/testsuite/gfortran.dg/list_read_2.f90
new file mode 100644 (file)
index 0000000..f60a836
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/list_read_2.f90
@@ -0,0 +1,25 @@
+! { dg-do run }
+! PR16805
+! Test list directed reads from character substrings
+! The IO library was reporting an error rather the end-or-fecord when it
+! got to the end of an internal file record.
+program list_read_2
+  implicit none
+  character*10 a
+  data a /'1234567890'/
+  integer i
+  logical debug
+  data debug /.TRUE./
+  read(a,*)i
+  if (i.ne.1234567890) call abort
+  read(a(1:1),*)i
+  if (i.ne.1) call abort
+  read(a(2:2),*)i
+  if (i.ne.2) call abort
+  read(a(1:5),*)i
+  if (i.ne.12345) call abort
+  read(a(5:10),*)i
+  if (i.ne.567890) call abort
+  read(a(10:10),*)i
+  if (i.ne.0) call abort
+end

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 83e03388269fe71312d30ff59e4c441316236804..50ad7a6290f0a40e8101173ca3771a349f37996e 100644 (file)
--- 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 8b00a5e296ea8438de3b57836d8f6efb2a60f911..f47d473df91dcef586ca41f259049edd7995473b 100644 (file)
--- 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 33d7fda4514fd900ce1991779367ea5392af4d60..377cadd438e1aa2ab51ba7f21c8d597fac9702dc 100644 (file)
--- 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;