diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/io/transfer.c | 11 |
2 files changed, 18 insertions, 0 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index f90d5301df8..48db71b8df7 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,5 +1,12 @@ 2015-11-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> + PR libfortran/52251 + * io/transfer.c (formatted_transfer_scalar_write): Reset skips count. + (finalize_transfer): For ADVANCE_NO, emit pending spaces and reset the + skip count. + +2015-11-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> + * io/write_float.def (output_float): Move block determining room for leading zero to before checkng g0 formatting. diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 746bb6dcc6c..94f1edaa679 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -1641,6 +1641,7 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin - dtp->u.p.current_unit->bytes_left); dtp->u.p.max_pos = dtp->u.p.max_pos > tmp ? dtp->u.p.max_pos : tmp; + dtp->u.p.skips = 0; } if (dtp->u.p.skips < 0) { @@ -3600,6 +3601,16 @@ finalize_transfer (st_parameter_dt *dtp) next I/O operation if needed. */ if (dtp->u.p.advance_status == ADVANCE_NO) { + if (dtp->u.p.skips > 0) + { + int tmp; + write_x (dtp, dtp->u.p.skips, dtp->u.p.pending_spaces); + tmp = (int)(dtp->u.p.current_unit->recl + - dtp->u.p.current_unit->bytes_left); + dtp->u.p.max_pos = + dtp->u.p.max_pos > tmp ? dtp->u.p.max_pos : tmp; + dtp->u.p.skips = 0; + } int bytes_written = (int) (dtp->u.p.current_unit->recl - dtp->u.p.current_unit->bytes_left); dtp->u.p.current_unit->saved_pos = |