From 802fc8260d06c25a9f6df650a2b6d4f6a7a2ddb7 Mon Sep 17 00:00:00 2001 From: Bud Davis Date: Wed, 11 May 2005 10:34:05 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gfortran.dg/dev_null.f90 | 11 +++++++++++ libgfortran/ChangeLog | 6 ++++++ libgfortran/io/unix.c | 6 ++++-- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/dev_null.f90 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d2ee0cadcc9..33a1e02c39b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2005-05-11 Bud Davis + + * gfortran.dg/dev_null.f90: New test. + 2005-05-11 Richard Earnshaw * 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 index 00000000000..edf93dbd1fc --- /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 fa866a1091f..eded92ede0b 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2005-05-11 Bud Davis + + PR fortran/19478 + * io/unix.c (fd_truncate): update positions when ftruncate + fails (like writing to /dev/null). + 2005-05-10 Francois-Xavier Coudert PR libfortran/21471 diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index 865eb68caf8..92eea53ee5b 100644 --- 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;