From 43e1d0c8b9c9ab4dbd6d7ce33368344bdaf2c526 Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Fri, 6 May 2016 01:18:59 +0000 Subject: [PATCH] backport: re PR libfortran/70684 (incorrect reading of values from file on Windows) 2016-05-05 Jerry DeLisle Backport from trunk. PR libgfortran/70684 * io/list_read (next_char): Add '\r' to check for end of line. factor. (two places) PR libgfortran/70684 * gfortran.dg/list_read_14.f90: New test. From-SVN: r235941 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/list_read_14.f90 | 25 ++++++++++++++++++++++ libgfortran/ChangeLog | 7 ++++++ libgfortran/io/list_read.c | 6 ++++-- 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/list_read_14.f90 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ad59aa11ed38..19b066b214da 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-05-05 Jerry DeLisle + + Backport from trunk. + PR libgfortran/70684 + * gfortran.dg/list_read_14.f90: New test. + 2016-04-28 Jakub Jelinek PR target/70858 diff --git a/gcc/testsuite/gfortran.dg/list_read_14.f90 b/gcc/testsuite/gfortran.dg/list_read_14.f90 new file mode 100644 index 000000000000..15bcfad500dd --- /dev/null +++ b/gcc/testsuite/gfortran.dg/list_read_14.f90 @@ -0,0 +1,25 @@ +! { dg-do run } +! PR70684 incorrect reading of values from file on Windows +program test +implicit none +integer,parameter :: isize=12 +integer,parameter :: funit=12 +integer :: i +character(1), parameter :: cr=char(13) +double precision, dimension(isize) :: a, res +res= (/ 1.0000000000000000, 2.0000000000000000, 3.0000000000000000, & + 4.0000000000000000, 5.0000000000000000, 6.0000000000000000, & + 7.0000000000000000, 8.0000000000000000, 9.0000000000000000, & + 10.000000000000000, 11.000000000000000, 12.000000000000000 /) +do i=1,isize + a(i)=dble(i) +enddo +open(funit,status="scratch") +write(funit,'(1x,6(f25.20,'',''),a)') (a(i),i=1,6), cr +write(funit,'(1x,6(f25.20,'',''),a)') (a(i),i=7,12), cr +rewind(funit) +a=0d0 +read(funit,*) (a(i),i=1,isize) +close(funit) +if (any(a /= res)) call abort +end diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index dba6ffbb5028..5f767c9b6149 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2016-05-05 Jerry DeLisle + + Backport from trunk. + PR libgfortran/70684 + * io/list_read (next_char): Add '\r' to check for end of line. + factor. (two places) + 2016-04-05 Jerry DeLisle Dominique d'Humieres diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index d3fac4c52a5c..9e6dd3153714 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -141,7 +141,8 @@ next_char (st_parameter_dt *dtp) dtp->u.p.at_eol = 0; c = dtp->u.p.last_char; dtp->u.p.last_char = EOF - 1; - goto done; + dtp->u.p.at_eol = (c == '\n' || c == '\r' || c == EOF); + return c; } /* Read from line_buffer if enabled. */ @@ -155,7 +156,8 @@ next_char (st_parameter_dt *dtp) { dtp->u.p.line_buffer[dtp->u.p.line_buffer_pos] = '\0'; dtp->u.p.line_buffer_pos++; - goto done; + dtp->u.p.at_eol = (c == '\n' || c == '\r' || c == EOF); + return c; } dtp->u.p.line_buffer_pos = 0; -- 2.47.2