From: Jerry DeLisle <jvdelisle@gcc.gnu.org>
Date: Thu, 19 Aug 2010 20:28:09 +0000 (+0000)
Subject: re PR fortran/45108 (Namelist read: Not aborted when reading from STDIN)
X-Git-Tag: releases/gcc-4.6.0~4923
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1721879798432788561c2dd7d8b8919ffa47b5d;p=thirdparty%2Fgcc.git

re PR fortran/45108 (Namelist read: Not aborted when reading from STDIN)

2010-08-19  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libfortran/45108
	* io/list_read.c (namelist_read): If namelist reading fails, use
	generate_error and then continue the read loop.

From-SVN: r163387
---

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index b0a9c05ceb62..3ffb78888810 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-19  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libfortran/45108
+	* io/list_read.c (namelist_read): If namelist reading fails, use
+	generate_error and then continue the read loop.
+
 2010-08-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR fortran/45308
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index c88edf69cb4f..d757b1c4826d 100644
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -2959,21 +2959,11 @@ find_nml_name:
       if (nml_get_obj_data (dtp, &prev_nl, nml_err_msg, sizeof nml_err_msg)
 			    == FAILURE)
 	{
-	  gfc_unit *u;
-
 	  if (dtp->u.p.current_unit->unit_number != options.stdin_unit)
 	    goto nml_err_ret;
-
-	  u = find_unit (options.stderr_unit);
-	  st_printf ("%s\n", nml_err_msg);
-	  if (u != NULL)
-	    {
-	      sflush (u->s);
-	      unlock_unit (u);
-	    }
+	  generate_error (&dtp->common, LIBERROR_READ_VALUE, nml_err_msg);
         }
-
-   }
+    }
 
   dtp->u.p.eof_jump = NULL;
   free_saved (dtp);