re PR libfortran/19478 (reading back from /dev/null)

	PR fortran/19478
	* io/unix.c (fd_truncate): update positions when ftruncate
	fails (like writing to /dev/null).
	* gfortran.dg/dev_null.f90: New test.

From-SVN: r99570

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d2ee0cadcc96022ed48c7f63b4ac3abdc5f7a5ed..33a1e02c39b41bf79d714e5d98bdb48f14697600 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-11  Bud Davis  <bdavis@gfortran.org>
+
+       * gfortran.dg/dev_null.f90: New test.
+
 2005-05-11  Richard Earnshaw  <richard.earnshaw@arm.com>
 
        * gcc.dg/arm-vfp1.c: Revert last change.

diff --git a/gcc/testsuite/gfortran.dg/dev_null.f90 b/gcc/testsuite/gfortran.dg/dev_null.f90
new file mode 100644 (file)
index 0000000..edf93db
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dev_null.f90
@@ -0,0 +1,11 @@
+! { dg-do run }
+! pr19478 read from /dev/null
+! Thomas.Koenig@online.de
+      character*20 foo
+      open(10,file="/dev/null")
+      write(10,'(A)') "Hello"
+      rewind(10)
+      read(10,'(A)',end=100) foo
+      call abort
+ 100  continue
+      end

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index fa866a1091f16a4bed4da46df18325545b899a09..eded92ede0bca56fc0d6103dfbca2d40cccc2408 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-11  Bud Davis  <bdavis@gfortran.org>
+
+       PR fortran/19478
+       * io/unix.c (fd_truncate): update positions when ftruncate
+       fails (like writing to /dev/null).
+
 2005-05-10  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
        PR libfortran/21471

diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
index 865eb68caf84430a258ff6e2a0e329f6ec728faf..92eea53ee5b03d6fd7daba20c598005a121131e7 100644 (file)
--- a/libgfortran/io/unix.c
+++ b/libgfortran/io/unix.c
@@ -515,13 +515,15 @@ fd_truncate (unix_stream * s)
 
 #ifdef HAVE_FTRUNCATE
   if (ftruncate (s->fd, s->logical_offset))
-    return FAILURE;
 #else
 #ifdef HAVE_CHSIZE
   if (chsize (s->fd, s->logical_offset))
-    return FAILURE;
 #endif
 #endif
+    {
+      s->physical_offset = s->file_length = 0;
+      return FAILURE;
+    }
 
   s->physical_offset = s->file_length = s->logical_offset;