diff options
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/io/io.h | 1 | ||||
| -rw-r--r-- | libgfortran/io/open.c | 6 | ||||
| -rw-r--r-- | libgfortran/io/transfer.c | 9 |
4 files changed, 18 insertions, 5 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index c62e6081450..553cd1a93a1 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2006-11-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + * io/io.h (unit_flags): Add new flag has_recl. + * io.open.c (new_unit): Set flag if RECL= was specified. + * io/transfer.c (us_write): If flag set, leave recl as initialized by + new_unit. + 2006-11-16 Francois-Xavier Coudert <coudert@clipper.ens.fr> * io/open.c (new_unit): Format %d expects an int variable. diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h index e009f17e3c4..e8e8390d1c5 100644 --- a/libgfortran/io/io.h +++ b/libgfortran/io/io.h @@ -470,6 +470,7 @@ typedef struct unit_status status; unit_pad pad; unit_convert convert; + int has_recl; } unit_flags; diff --git a/libgfortran/io/open.c b/libgfortran/io/open.c index ce7d4dd2cbf..9b4f0cd7122 100644 --- a/libgfortran/io/open.c +++ b/libgfortran/io/open.c @@ -406,9 +406,13 @@ new_unit (st_parameter_open *opp, gfc_unit *u, unit_flags * flags) /* Unspecified recl ends up with a processor dependent value. */ if ((opp->common.flags & IOPARM_OPEN_HAS_RECL_IN)) - u->recl = opp->recl_in; + { + u->flags.has_recl = 1; + u->recl = opp->recl_in; + } else { + u->flags.has_recl = 0; switch (compile_options.record_marker) { case 0: diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index c8fd5571e5f..329d49828d4 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -1459,10 +1459,11 @@ us_write (st_parameter_dt *dtp) if (swrite (dtp->u.p.current_unit->s, &dummy, &nbytes) != 0) generate_error (&dtp->common, ERROR_OS, NULL); - /* For sequential unformatted, we write until we have more bytes - than can fit in the record markers. If disk space runs out first, - it will error on the write. */ - dtp->u.p.current_unit->recl = max_offset; + /* For sequential unformatted, if RECL= was not specified in the OPEN + we write until we have more bytes than can fit in the record markers. + If disk space runs out first, it will error on the write. */ + if (dtp->u.p.current_unit->flags.has_recl == 0) + dtp->u.p.current_unit->recl = max_offset; dtp->u.p.current_unit->bytes_left = dtp->u.p.current_unit->recl; } |