git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libfortran/35293 (truncation errors with gfortran.dg/streamio_11.f90, 3, 4 and 15.) 

PR libfortran/35293
	* io/unix.c (fd_truncate): Fold s->special_file case into
	success case of ftruncate/chsize call instead of the failure case.
	Make failure case actually return failure.  Properly update stream
	pointers on failure.  Call runtime_error for targets without
	neither ftruncate nor chsize where such a call would be needed.

From-SVN: r132888
This commit is contained in:
Hans-Peter Nilsson 2008-03-05 01:50:33 +00:00 committed by Hans-Peter Nilsson
parent 07c40d0bb9
commit 25abf44844
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libgfortran/ChangeLog
View File

@ -1,3 +1,12 @@
2008-03-05 Hans-Peter Nilsson <hp@axis.com>
PR libfortran/35293
* io/unix.c (fd_truncate): Fold s->special_file case into
success case of ftruncate/chsize call instead of the failure case.
Make failure case actually return failure. Properly update stream
pointers on failure. Call runtime_error for targets without
neither ftruncate nor chsize where such a call would be needed.
2008-03-03 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> 2008-03-03 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/33197 PR fortran/33197

24
libgfortran/io/unix.c
View File

@ -706,16 +706,28 @@ fd_truncate (unix_stream * s)
/* Using ftruncate on a seekable special file (like /dev/null) /* Using ftruncate on a seekable special file (like /dev/null)
is undefined, so we treat it as if the ftruncate succeeded. */ is undefined, so we treat it as if the ftruncate succeeded. */
if (!s->special_file
&& (
#ifdef HAVE_FTRUNCATE #ifdef HAVE_FTRUNCATE
if (s->special_file || ftruncate (s->fd, s->logical_offset)) ftruncate (s->fd, s->logical_offset) != 0
#elif defined HAVE_CHSIZE
chsize (s->fd, s->logical_offset) != 0
#else #else
#ifdef HAVE_CHSIZE /* If we have neither, always fail and exit, noisily. */
if (s->special_file || chsize (s->fd, s->logical_offset)) runtime_error ("required ftruncate or chsize support not present"), 1
#endif
#endif #endif
))
{ {
s->physical_offset = s->file_length = 0; /* The truncation failed and we need to handle this gracefully.
return SUCCESS; The file length remains the same, but the file-descriptor
offset needs adjustment per the successful lseek above.
(Similarly, the contents of the buffer isn't valid anymore.)
A ftruncate call does not affect the physical (file-descriptor)
offset, according to the ftruncate manual, so neither should a
failed call. */
s->physical_offset = s->logical_offset;
s->active = 0;
return FAILURE;
} }
s->physical_offset = s->file_length = s->logical_offset; s->physical_offset = s->file_length = s->logical_offset;