scanner.c (load_line): At end of line, skip '\r' without setting the truncation flag.

2009-02-19  Daniel Franke  <franke.daniel@gmail.com>

        * scanner.c (load_line): At end of line, skip '\r' without setting
        the truncation flag.

From-SVN: r144303

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 694c67f4608180f14edb88f35a5b4db1f8c7b1e0..147891a0822f07cc77449a26e95f7feb60ae2268 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-19  Daniel Franke  <franke.daniel@gmail.com>
+
+       * scanner.c (load_line): At end of line, skip '\r' without setting
+       the truncation flag.
+
 2009-02-18  Daniel Kraft  <d@domob.eu>
 
        * gfortran.texi: New chapter about compiler characteristics.

diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index c45827f08a1c581b5b0539916104b0b37ad68ed1..f457b3250842feb3f3f9b1419030e694dcf50f4d 100644 (file)
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -1469,6 +1469,9 @@ load_line (FILE *input, gfc_char_t **pbuf, int *pbuflen, const int *first_char)
          for (;;)
            {
              c = getc (input);
+             if (c == '\r')
+               continue;
+
              if (c == '\n' || c == EOF)
                break;