procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/35632 (stream io broken on FreeBSD due to ftruncate changes.)

Browse source 
2008-03-22  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libfortran/35632
	* io/transfer.c (data_transfer_init):  Fix whitespace.
	(next_record_w): Truncate the file only if the stream
	position is short of the file end.

From-SVN: r133454
This commit is contained in:
Jerry DeLisle 2008-03-22 22:03:13 +00:00
parent 1b738915e8
commit 35077d5aed
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libgfortran/ChangeLog
View file

@ -1,3 +1,10 @@
2008-03-22 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/35632
* io/transfer.c (data_transfer_init): Fix whitespace.
(next_record_w): Truncate the file only if the stream
position is short of the file end.
2008-03-21 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* intrinsics/pack_generic.c: Fix typo.

8
libgfortran/io/transfer.c
View file

@ -1985,12 +1985,12 @@ data_transfer_init (st_parameter_dt *dtp, int read_flag)
if (dtp->u.p.mode == READING
&& dtp->u.p.current_unit->mode == WRITING
&& !is_internal_unit (dtp))
flush(dtp->u.p.current_unit->s);
flush(dtp->u.p.current_unit->s);
/* Check whether the record exists to be read. Only
a partial record needs to exist. */
if (dtp->u.p.mode == READING && (dtp->rec -1)
if (dtp->u.p.mode == READING && (dtp->rec - 1)
* dtp->u.p.current_unit->recl >= file_length (dtp->u.p.current_unit->s))
{
generate_error (&dtp->common, LIBERROR_BAD_OPTION,
@ -2604,7 +2604,9 @@ next_record_w (st_parameter_dt *dtp, int done)
if (is_stream_io (dtp))
{
dtp->u.p.current_unit->strm_pos += len;
struncate(dtp->u.p.current_unit->s);
if (dtp->u.p.current_unit->strm_pos
< file_length (dtp->u.p.current_unit->s))
struncate (dtp->u.p.current_unit->s);
}
}