diff options
| author | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-29 17:38:46 +0000 |
|---|---|---|
| committer | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-29 17:38:46 +0000 |
| commit | 33ea6150f326adb2eb64c3837973d72c2801c8ff (patch) | |
| tree | ee47c83148e108305938eb2264d383e28dae885d /libgfortran | |
| parent | c6b55fbf206b5edf5977ec978854efa76bfa3936 (diff) | |
| download | gcc-33ea6150f326adb2eb64c3837973d72c2801c8ff.tar.gz | |
2012-09-29 Thomas König <tkoenig@gcc.gnu.org>
PR fortran/52724
* list_read.c (next_char): Handle kind=4 characters.
* unix.c (open_internal4): Correct lenth of internal file.
2012-09-29 Thomas König <tkoenig@gcc.gnu.org>
PR fortran/52724
* gfortran.dg/internal_readwrite_3.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@191854 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 13 | ||||
| -rw-r--r-- | libgfortran/io/unix.c | 2 |
3 files changed, 17 insertions, 4 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index f8a68d74171..feeb10a4146 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2012-09-29 Thomas König <tkoenig@gcc.gnu.org> + + PR fortran/52724 + * list_read.c (next_char): Handle kind=4 characters. + * unix.c (open_internal4): Correct lenth of internal file. + 2012-09-14 David Edelsohn <dje.gcc@gmail.com> * configure: Regenerated. diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index 9d301d62418..403e7190a12 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -199,9 +199,16 @@ next_char (st_parameter_dt *dtp) if (is_internal_unit (dtp)) { - char cc; - length = sread (dtp->u.p.current_unit->s, &cc, 1); - c = cc; + /* Check for kind=4 internal unit. */ + if (dtp->common.unit) + length = sread (dtp->u.p.current_unit->s, &c, sizeof (gfc_char4_t)); + else + { + char cc; + length = sread (dtp->u.p.current_unit->s, &cc, 1); + c = cc; + } + if (length < 0) { generate_error (&dtp->common, LIBERROR_OS, NULL); diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index 1a9faea486e..805d4bbd205 100644 --- a/libgfortran/io/unix.c +++ b/libgfortran/io/unix.c @@ -959,7 +959,7 @@ open_internal4 (char *base, int length, gfc_offset offset) s->buffer = base; s->buffer_offset = offset; - s->active = s->file_length = length; + s->active = s->file_length = length * sizeof (gfc_char4_t); s->st.vptr = &mem4_vtable; |