diff options
| author | jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-11 15:02:41 +0000 |
|---|---|---|
| committer | jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-11 15:02:41 +0000 |
| commit | 4d02c7e595ce4136811b670a53ab62408caeb357 (patch) | |
| tree | e2c1fd002e3ee4b1b305af00524e85b18ff06e12 /libgfortran | |
| parent | 2f895281e87cdfc62be1f0a8ecc32ada4d8834da (diff) | |
| download | gcc-4d02c7e595ce4136811b670a53ab62408caeb357.tar.gz | |
2008-05-11 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/36202
* io/list_read (eat_separator): Handle the CR-LF case correctly.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135177 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 5 | ||||
| -rw-r--r-- | libgfortran/io/list_read.c | 16 |
2 files changed, 9 insertions, 12 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 62b00bc121a..5be3cae4fa1 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2008-05-11 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR libfortran/36202 + * io/list_read (eat_separator): Handle the CR-LF case correctly. + 2008-05-09 Julian Brown <julian@codesourcery.com> * Makefile.am (LTLDFLAGS): New. diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index 802bf9e7706..d3e932e4074 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -347,20 +347,12 @@ eat_separator (st_parameter_dt *dtp) case '\r': dtp->u.p.at_eol = 1; n = next_char(dtp); - if (n == '\n') + if (n != '\n') { - if (dtp->u.p.namelist_mode) - { - do - c = next_char (dtp); - while (c == '\n' || c == '\r' || c == ' '); - unget_char (dtp, c); - } + unget_char (dtp, n); + break; } - else - unget_char (dtp, n); - break; - + /* Fall through. */ case '\n': dtp->u.p.at_eol = 1; if (dtp->u.p.namelist_mode) |