backport: re PR fortran/56735 (Namelist Read Error with question marks)

2013-04-04  Tobias Burnus  <burnus@net-b.de>

        Backport from mainline:
        2013-03-28  Tobias Burnus  <burnus@net-b.de>

        PR fortran/56735
        * io/list_read.c (nml_query): Only abort when
        an error occured.
        (namelist_read): Add goto instead of falling through.

2013-04-04  Tobias Burnus  <burnus@net-b.de>

        Backport from mainline:
        2013-03-28  Tobias Burnus  <burnus@net-b.de>

        PR fortran/56735
        * gfortran.dg/namelist_80.f90: New.

From-SVN: r197470

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cf1b7c9e199d468ffb9a0caa8d6dc23f79e667f3..2dcfa1ef07d7b679aeb3a99a23d8767b7d5a0e2b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-04  Tobias Burnus  <burnus@net-b.de>
+
+       Backport from mainline:
+       2013-03-28  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/56735
+       * gfortran.dg/namelist_80.f90: New.
+
 2013-04-03  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
@@ -37,7 +45,7 @@
        * gcc.dg/pr54363.c: New test.
 
        2012-05-03  Jakub Jelinek  <jakub@redhat.com>
- 
+
        PR debug/53174
        * gcc.dg/pr53174.c: New test.
 

diff --git a/gcc/testsuite/gfortran.dg/namelist_80.f90 b/gcc/testsuite/gfortran.dg/namelist_80.f90
new file mode 100644 (file)
index 0000000..1961b11
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/namelist_80.f90
@@ -0,0 +1,27 @@
+! { dg-do run }
+!
+! PR fortran/56735
+!
+! Contributed by Adam Williams
+!
+        PROGRAM TEST
+        INTEGER int1,int2,int3
+        NAMELIST /temp/ int1,int2,int3
+
+        int1 = -1; int2 = -2; int3 = -3
+
+        OPEN (53, STATUS='scratch')
+        WRITE (53, '(a)') ' ?'
+        WRITE (53, '(a)')
+        WRITE (53, '(a)') '$temp'
+        WRITE (53, '(a)') ' int1=1'
+        WRITE (53, '(a)') ' int2=2'
+        WRITE (53, '(a)') ' int3=3'
+        WRITE (53, '(a)') '$END'
+        REWIND(53)
+
+        READ (53, temp)
+        CLOSE (53)
+
+        if (int1 /= 1 .or. int2 /= 2 .or. int3 /= 3) call abort()
+        END PROGRAM

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index a57a66dac2936c8ff1778ad2b2118a294d961694..573093811dfa7abac2e6f4c904bc5e5123a40524 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,13 @@
+2013-04-04  Tobias Burnus  <burnus@net-b.de>
+
+       Backport from mainline:
+       2013-03-28  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/56735
+       * io/list_read.c (nml_query): Only abort when
+       an error occured.
+       (namelist_read): Add goto instead of falling through.
+
 2012-10-21  Thomas König  <tkoenig@gcc.gnu.org>
 
        PR libfortran/54736

diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index c473c58b0ce459d7e0ca739e2c652eeacaf54701..198f9a702915f6de9677d12b11d8b92e7727384b 100644 (file)
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -2327,11 +2327,11 @@ nml_query (st_parameter_dt *dtp, char c)
   index_type len;
   char * p;
 #ifdef HAVE_CRLF
-  static const index_type endlen = 3;
+  static const index_type endlen = 2;
   static const char endl[] = "\r\n";
   static const char nmlend[] = "&end\r\n";
 #else
-  static const index_type endlen = 2;
+  static const index_type endlen = 1;
   static const char endl[] = "\n";
   static const char nmlend[] = "&end\n";
 #endif
@@ -2361,12 +2361,12 @@ nml_query (st_parameter_dt *dtp, char c)
          /* "&namelist_name\n"  */
 
          len = dtp->namelist_name_len;
-         p = write_block (dtp, len + endlen);
+         p = write_block (dtp, len - 1 + endlen);
           if (!p)
             goto query_return;
          memcpy (p, "&", 1);
          memcpy ((char*)(p + 1), dtp->namelist_name, len);
-         memcpy ((char*)(p + len + 1), &endl, endlen - 1);
+         memcpy ((char*)(p + len + 1), &endl, endlen);
          for (nl = dtp->u.p.ionml; nl; nl = nl->next)
            {
              /* " var_name\n"  */
@@ -2377,14 +2377,15 @@ nml_query (st_parameter_dt *dtp, char c)
                goto query_return;
              memcpy (p, " ", 1);
              memcpy ((char*)(p + 1), nl->var_name, len);
-             memcpy ((char*)(p + len + 1), &endl, endlen - 1);
+             memcpy ((char*)(p + len + 1), &endl, endlen);
            }
 
          /* "&end\n"  */
 
-          p = write_block (dtp, endlen + 3);
+          p = write_block (dtp, endlen + 4);
+         if (!p)
            goto query_return;
-          memcpy (p, &nmlend, endlen + 3);
+          memcpy (p, &nmlend, endlen + 4);
        }
 
       /* Flush the stream to force immediate output.  */
@@ -3015,6 +3016,7 @@ find_nml_name:
 
     case '?':
       nml_query (dtp, '?');
+      goto find_nml_name;
 
     case EOF:
       return;