git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jerry DeLisle 2010-08-19 20:28:09 +00:00
parent 29e8814292
commit e172187979
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgfortran/ChangeLog
View File

@ -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> 2010-08-17 Jakub Jelinek <jakub@redhat.com>
PR fortran/45308 PR fortran/45308

14
libgfortran/io/list_read.c
View File

@ -2959,21 +2959,11 @@ find_nml_name:
if (nml_get_obj_data (dtp, &prev_nl, nml_err_msg, sizeof nml_err_msg) if (nml_get_obj_data (dtp, &prev_nl, nml_err_msg, sizeof nml_err_msg)
== FAILURE) == FAILURE)
{ {
gfc_unit *u;
if (dtp->u.p.current_unit->unit_number != options.stdin_unit) if (dtp->u.p.current_unit->unit_number != options.stdin_unit)
goto nml_err_ret; goto nml_err_ret;
generate_error (&dtp->common, LIBERROR_READ_VALUE, nml_err_msg);
u = find_unit (options.stderr_unit);
st_printf ("%s\n", nml_err_msg);
if (u != NULL)
{
sflush (u->s);
unlock_unit (u);
}
} }
}
}
dtp->u.p.eof_jump = NULL; dtp->u.p.eof_jump = NULL;
free_saved (dtp); free_saved (dtp);