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

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

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 62b00bc121af632c40ed3c7ecfce4846da8a65a8..5be3cae4fa1ec29d5677a63c61e6b0bfc220fbf3 100644 (file)
--- 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 802bf9e7706dc9d670058bb5dbd45920405e856f..d3e932e4074b85159052dc503ab4bfa040fbb2c0 100644 (file)
--- 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)