[Bug libfortran/24919] New: GFORTRAN input and carriage returns

[Bug libfortran/24919] New: GFORTRAN input and carriage returns

[ray at ultramarine dot com]

When reading a "dos" file, gfortran returns two records for each line
in the file: the real record and a null one. In other words it is treating
the carriage return as a newline instead of the pair carriage return/newline
as the newline.
Here is an example:


      integer ios
      character buf*(50)
c
      open(10,file='dos',iostat=ios)
      print *,' open ios ',ios
 1000 read(10,'(a)',iostat=ios) buf
      if(ios .ne.0) go to 9000
      print '(a,a,a)',' read <',buf,'>'
      go to 1000
c
 9000 end


-- 
           Summary: GFORTRAN input and carriage returns
           Product: gcc
           Version: unknown
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: libfortran
        AssignedTo: unassigned at gcc dot gnu dot org
        ReportedBy: ray at ultramarine dot com


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[pinskia at gcc dot gnu dot org]

------- Comment #1 from pinskia at gcc dot gnu dot org  2005-11-17 20:11 -------
*** Bug 24918 has been marked as a duplicate of this bug. ***


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[pinskia at gcc dot gnu dot org]

------- Comment #2 from pinskia at gcc dot gnu dot org  2005-11-17 20:13 -------
First can you try 4.0.2 or a snapshot of 4.0.3? Second can you attach the dos
file?


-- 

pinskia at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |pinskia at gcc dot gnu dot
                   |                            |org


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[ray at ultramarine dot com]

------- Comment #3 from ray at ultramarine dot com  2005-11-17 20:28 -------
Subject: Re:  GFORTRAN input and carriage returns

On Thu, 17 Nov 2005, pinskia at gcc dot gnu dot org wrote:

> 
> 
> ------- Comment #2 from pinskia at gcc dot gnu dot org  2005-11-17 20:13 -------
> First can you try 4.0.2 or a snapshot of 4.0.3? Second can you attach the dos
> file?
> 
> 
> -- 
> 
> pinskia at gcc dot gnu dot org changed:
> 
>            What    |Removed                     |Added
> ----------------------------------------------------------------------------
>                  CC|                            |pinskia at gcc dot gnu dot
>                    |                            |org
> 
> 

  Sorry, but there was no good way to do that with the form.


------- Comment #4 from ray at ultramarine dot com  2005-11-17 20:28 -------
Created an attachment (id=10268)
 --> (http://gcc.gnu.org/bugzilla/attachment.cgi?id=10268&action=view)


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[pinskia at gcc dot gnu dot org]

------- Comment #5 from pinskia at gcc dot gnu dot org  2005-11-17 20:31 -------
Confirmed on the mainline.


-- 

pinskia at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
OtherBugsDependingO|                            |19292
              nThis|                            |
             Status|UNCONFIRMED                 |NEW
     Ever Confirmed|0                           |1
   Last reconfirmed|0000-00-00 00:00:00         |2005-11-17 20:31:40
               date|                            |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[jvdelisle at gcc dot gnu dot org]

------- Comment #6 from jvdelisle at gcc dot gnu dot org  2005-11-18 00:47 -------
This is near stuff I am working on so I will work it.


-- 

jvdelisle at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at gcc dot gnu   |jvdelisle at gcc dot gnu dot
                   |dot org                     |org
             Status|NEW                         |ASSIGNED


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[fxcoudert at gcc dot gnu dot org]

------- Comment #7 from fxcoudert at gcc dot gnu dot org  2005-11-18 13:38 -------
(In reply to comment #6)
> This is near stuff I am working on so I will work it.

This is amazing because I thought I add it fixed some time ago now. I will look
into it too in the train tonight ;-)


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[ray at ultramarine dot com]

------- Comment #8 from ray at ultramarine dot com  2005-11-18 19:32 -------
(In reply to comment #3)
> Subject: Re:  GFORTRAN input and carriage returns
> 
> On Thu, 17 Nov 2005, pinskia at gcc dot gnu dot org wrote:
> 
> > 
> > 
> > ------- Comment #2 from pinskia at gcc dot gnu dot org  2005-11-17 20:13 -------
> > First can you try 4.0.2 or a snapshot of 4.0.3? Second can you attach the dos
> > file?


     Tried yesterday's snapshot of 4.1 and it still does not work.
> > 
> > 
> > -- 
> > 
> > pinskia at gcc dot gnu dot org changed:
> > 
> >            What    |Removed                     |Added
> > ----------------------------------------------------------------------------
> >                  CC|                            |pinskia at gcc dot gnu dot
> >                    |                            |org
> > 
> > 
> 
>   Sorry, but there was no good way to do that with the form.
> 


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[fxcoudert at gcc dot gnu dot org]

------- Comment #9 from fxcoudert at gcc dot gnu dot org  2005-11-19 00:58 -------
(In reply to comment #8)
> Tried yesterday's snapshot of 4.1 and it still does not work.

OK, I'm on it. Looks like someone forgot about CRLF systems :)

I'll try to submit a first patch tomorrow...


-- 

fxcoudert at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|jvdelisle at gcc dot gnu dot|fxcoudert at gcc dot gnu dot
                   |org                         |org


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[ray at ultramarine dot com]

------- Comment #10 from ray at ultramarine dot com  2005-11-21 13:52 -------
(In reply to comment #9)
> (In reply to comment #8)
> > Tried yesterday's snapshot of 4.1 and it still does not work.
> 
> OK, I'm on it. Looks like someone forgot about CRLF systems :)
> 
> I'll try to submit a first patch tomorrow...
> 
    The following changes in transfer.c appear to fix the problem in Linux:
157c157
<   char *base, *p, *q;
---
>   char *base, *p, *q, last;
173a174
>   last    = 0;
197c198
<       if (readlen < 1 || *q == '\n' || *q == '\r')
---
>       if (readlen < 1 || *q == '\n' )
215a217,219
>           if ( last  == '\r') {
>              *length = n-1;
>           } else {
216a221
>           }
222a228
>       last = *q;

  Ray


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[fxcoudert at gcc dot gnu dot org]

------- Comment #11 from fxcoudert at gcc dot gnu dot org  2005-11-21 14:02 -------
(In reply to comment #10)
> The following changes in transfer.c appear to fix the problem in Linux:

Confirming this patch, I have something similar in my own tree. But there are
some other problems with CRLF and I'll try to submit a full patch soon (a few
days at most) to fix them all. Forcing HAVE_CRLF in config.h and running the
testsuite appears to be a very good way to find those :)


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[jvdelisle at verizon dot net]

------- Comment #12 from jvdelisle at verizon dot net  2005-11-21 14:21 -------
Subject: Re:  GFORTRAN input and carriage returns

fxcoudert at gcc dot gnu dot org wrote:
> ------- Comment #11 from fxcoudert at gcc dot gnu dot org  2005-11-21 14:02 -------
> (In reply to comment #10)
> 
>>The following changes in transfer.c appear to fix the problem in Linux:
> 
> 
> Confirming this patch, I have something similar in my own tree. But there are
> some other problems with CRLF and I'll try to submit a full patch soon (a few
> days at most) to fix them all. Forcing HAVE_CRLF in config.h and running the
> testsuite appears to be a very good way to find those :)
> 
> 
Tres bien!


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[fxcoudert at gcc dot gnu dot org]

------- Comment #13 from fxcoudert at gcc dot gnu dot org  2005-11-22 22:59 -------
(In reply to comment #10)
> The following changes in transfer.c appear to fix the problem in Linux

Well, this patch is actually not OK, since it causes regression in the handling
of EOR (like eor_handling_3.f90 and eor_handling_5.f90 from the testsuite). I'm
still working on something, but wanted to note somewhere (just in case) that
this patch is not OK.


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] GFORTRAN input and carriage returns

[fxcoudert at gcc dot gnu dot org]

------- Comment #14 from fxcoudert at gcc dot gnu dot org  2005-11-23 12:57 -------
Created an attachment (id=10325)
 --> (http://gcc.gnu.org/bugzilla/attachment.cgi?id=10325&action=view)
Almost complete patch for handling CRLF correctly

Attached patch corrects the problem reported here as well as most other
problems related to CRLF. There is still a slight issue with the handling of T
format descriptors. When this is resolved, I'll submit the patch properly.


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] CRLF support in libgfortran

[fxcoudert at gcc dot gnu dot org]

-- 

fxcoudert at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|GFORTRAN input and carriage |CRLF support in libgfortran
                   |returns                     |
   Target Milestone|---                         |4.1.0


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] CRLF support in libgfortran

[fxcoudert at gcc dot gnu dot org]

------- Comment #15 from fxcoudert at gcc dot gnu dot org  2005-11-23 16:58 -------
Complete patch submitted for review.


-- 

fxcoudert at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                URL|                            |http://gcc.gnu.org/ml/fortra
                   |                            |n/2005-11/msg00617.html
           Keywords|                            |patch


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] CRLF support in libgfortran

[fxcoudert at gcc dot gnu dot org]

------- Comment #16 from fxcoudert at gcc dot gnu dot org  2005-11-27 11:42 -------
Subject: Bug 24919

Author: fxcoudert
Date: Sun Nov 27 11:42:46 2005
New Revision: 107563

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=107563
Log:
        PR libfortran/24919

        * io/list_read.c (eat_separator, finish_separator,
        read_character): Handle CRLF separators correctly during reads.
        (nml_query): Use the HAVE_CRLF macro to print adequate newlines.
        * io/io.h (st_parameter_dt): Add comment about the possible
        values for sf_seen_eor.
        * io/unix.c (tempfile, regular_file): HAVE_CRLF doesn't imply
        that O_BINARY is defined, so we add that condition.
        (stream_at_bof): Fix typo in comment.
        * io/transfer.c (read_sf): Handle correctly CRLF, setting
        sf_seen_eor value to 2 instead of 1.
        (formatted_transfer_scalar): Use the sf_seen_eor value to
        handle CRLF the right way.
        * io/write.c (nml_write_obj, namelist_write): Use CRLF as newline
        when HAVE_CRLF is defined.

        * gfortran.dg/ftell_1.f90: Modify testcase so that it doesn't
        fail on CRLF platforms.
        * gfortran.dg/ftell_2.f90: Likewise.

Modified:
    trunk/gcc/testsuite/ChangeLog
    trunk/gcc/testsuite/gfortran.dg/ftell_1.f90
    trunk/gcc/testsuite/gfortran.dg/ftell_2.f90
    trunk/libgfortran/ChangeLog
    trunk/libgfortran/io/io.h
    trunk/libgfortran/io/list_read.c
    trunk/libgfortran/io/transfer.c
    trunk/libgfortran/io/unix.c
    trunk/libgfortran/io/write.c


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] [4.0/4.1] CRLF support in libgfortran

[fxcoudert at gcc dot gnu dot org]

------- Comment #17 from fxcoudert at gcc dot gnu dot org  2005-11-27 12:25 -------
Will wait a bit before backporting to 4.1.


-- 

fxcoudert at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|CRLF support in libgfortran |[4.0/4.1] CRLF support in
                   |                            |libgfortran


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] [4.0/4.1] CRLF support in libgfortran

[fxcoudert at gcc dot gnu dot org]

------- Comment #18 from fxcoudert at gcc dot gnu dot org  2005-12-02 15:35 -------
Subject: Bug 24919

Author: fxcoudert
Date: Fri Dec  2 15:35:47 2005
New Revision: 107895

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=107895
Log:
        PR libfortran/24919
        * io/list_read.c (eat_separator, finish_separator,
        read_character): Handle CRLF separators correctly during reads.
        (nml_query): Use the HAVE_CRLF macro to print adequate newlines.
        * io/io.h (st_parameter_dt): Add comment about the possible
        values for sf_seen_eor.
        * io/unix.c (tempfile, regular_file): HAVE_CRLF doesn't imply
        that O_BINARY is defined, so we add that condition.
        (stream_at_bof): Fix typo in comment.
        * io/transfer.c (read_sf): Handle correctly CRLF, setting
        sf_seen_eor value to 2 instead of 1.
        (formatted_transfer_scalar): Use the sf_seen_eor value to
        handle CRLF the right way.
        * io/write.c (nml_write_obj, namelist_write): Use CRLF as newline
        when HAVE_CRLF is defined.


Modified:
    branches/gcc-4_1-branch/libgfortran/ChangeLog
    branches/gcc-4_1-branch/libgfortran/io/io.h
    branches/gcc-4_1-branch/libgfortran/io/list_read.c
    branches/gcc-4_1-branch/libgfortran/io/transfer.c
    branches/gcc-4_1-branch/libgfortran/io/unix.c
    branches/gcc-4_1-branch/libgfortran/io/write.c


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919

[Bug libfortran/24919] [4.0] CRLF support in libgfortran

[fxcoudert at gcc dot gnu dot org]

------- Comment #19 from fxcoudert at gcc dot gnu dot org  2005-12-02 15:47 -------
Backported to 4.1. Will not fix on 4.0 since 4.1.0 will be released soon and
mingw does not intend to use gcc-4.0.x


-- 

fxcoudert at gcc dot gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|                            |FIXED
            Summary|[4.0/4.1] CRLF support in   |[4.0] CRLF support in
                   |libgfortran                 |libgfortran


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24919