OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libfortran/36202 ([mingw] Namelist read fails with CRLF)

Browse Source 
2008-05-11  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libfortran/36202
	* io/list_read (eat_separator): Handle the CR-LF case correctly.

From-SVN: r135177
This commit is contained in:
Jerry DeLisle 2008-05-11 15:02:41 +00:00
parent 68b28852e7
commit 36afed5a79
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgfortran/ChangeLog
View File

@ -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> 2008-05-09 Julian Brown <julian@codesourcery.com>
* Makefile.am (LTLDFLAGS): New. * Makefile.am (LTLDFLAGS): New.

16
libgfortran/io/list_read.c
View File

@ -347,20 +347,12 @@ eat_separator (st_parameter_dt *dtp)
case '\r': case '\r':
dtp->u.p.at_eol = 1; dtp->u.p.at_eol = 1;
n = next_char(dtp); n = next_char(dtp);
if (n == '\n') if (n != '\n')
{ {
if (dtp->u.p.namelist_mode) unget_char (dtp, n);
{ break;
do
c = next_char (dtp);
while (c == '\n' || c == '\r' || c == ' ');
unget_char (dtp, c);
}
} }
else /* Fall through. */
unget_char (dtp, n);
break;
case '\n': case '\n':
dtp->u.p.at_eol = 1; dtp->u.p.at_eol = 1;
if (dtp->u.p.namelist_mode) if (dtp->u.p.namelist_mode)