From 272c35bd98b4b9276aef1c53bceadc3535e6dc9c Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Wed, 18 Jan 2006 00:52:21 +0000 Subject: re PR libfortran/25631 (tl format specifier not working correctly) 2006-01-17 Jerry DeLisle PR libgfortran/25631 * io/transfer.c (formatted_transfer_scalar): Adjust pending_spaces and skips so that TL works correctly when no bytes_used yet. From-SVN: r109858 --- libgfortran/io/transfer.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'libgfortran/io/transfer.c') diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 049ebb2..7298835 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -868,7 +868,21 @@ formatted_transfer_scalar (st_parameter_dt *dtp, bt type, void *p, int len, case FMT_TL: case FMT_T: if (f->format == FMT_TL) - pos = bytes_used - f->u.n; + { + + /* Handle the special case when no bytes have been used yet. + Cannot go below zero. */ + if (bytes_used == 0) + { + dtp->u.p.pending_spaces -= f->u.n; + dtp->u.p.pending_spaces = dtp->u.p.pending_spaces < 0 ? 0 + : dtp->u.p.pending_spaces; + dtp->u.p.skips -= f->u.n; + dtp->u.p.skips = dtp->u.p.skips < 0 ? 0 : dtp->u.p.skips; + } + + pos = bytes_used - f->u.n; + } else /* FMT_T */ { consume_data_flag = 0; -- cgit v1.1