ping - [Patch, libgfortran] PR26661 Sequential formatted read goes too far

[Jerry DeLisle]

:REVIEWMAIL:

Jerry DeLisle wrote:
> Jack Howarth wrote:
> 
>>    Just a reminder that this has been tested with the original 
>> xplor-nih code
>> that revealed the glitch (reading data files which were missing a 
>> terminal
>> newline) and the patch works fine. Can we get this into trunk and 4.1?
>>         Jack
>>
> Yes,
> 
> FX is going to review soon then we commit when he approves.  4.1 will 
> follow shortly after that.
> 
> Jerry
> 

Hi Folks,

Here is a cleaner approach to this patch.  I modified read_sf to pass a 
"no_error" flag as an argument and use that instead of read_block in read_x. 
This eliminates one call level in read_x.  Attached patch is fully tested.

OK for trunk and then 4.1?

Regards,

Jerry

2006-03-22  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/26661
	* io/io.h: Add read_sf so it can be used by read_x.
	* io/transfer.c (read_sf): Pass no_error flag to read_sf.  Use it to
	break out rather than error on EOF or EOR conditions.
	(read_block): Update call to read_sf.
	(read_block_direct): Ditto.
	* io/read.c (read_x): Use the modified read_sf instead of read_block.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: pr26661a.diff
Type: text/x-patch
Size: 3422 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/fortran/attachments/20060323/4e6425ae/attachment.bin>