On 03/22/2011 06:19 AM, Janne Blomqvist wrote:
On Tue, Mar 22, 2011 at 03:15, Jerry DeLisle<jvdeli...@frontier.com> wrote:
Ping
On 03/19/2011 09:46 PM, Jerry DeLisle wrote:
Hi,
The attached patch re-implements read_x using fbuf_getc. Self explanatory.
I suspect this doesn't actually fix the issue with reading from a pipe
before we have consumed all existing data in all cases, as in line
1212 fbuf_read() is still called. Thus I think we should fold this EOF
detection in line 1212-1228 into the main while loop similar to
transfer.c:read_sf(). Or am I missing something?
No, my bad. I forgot to delete some of the old code and when I was done I just
looked at the diff and did not see what I had not deleted.
Attached is corrected, once again regression tested.
Thanks,
Jerry
Index: read.c
===================================================================
--- read.c (revision 171191)
+++ read.c (working copy)
@@ -1186,8 +1186,7 @@ bad_float:
void
read_x (st_parameter_dt *dtp, int n)
{
- int length;
- char *p, q;
+ int length, q, q2;
if ((dtp->u.p.current_unit->pad_status == PAD_NO || is_internal_unit (dtp))
&& dtp->u.p.current_unit->bytes_left < n)
@@ -1200,7 +1199,7 @@ read_x (st_parameter_dt *dtp, int n)
if (is_internal_unit (dtp))
{
- p = mem_alloc_r (dtp->u.p.current_unit->s, &length);
+ mem_alloc_r (dtp->u.p.current_unit->s, &length);
if (unlikely (length < n))
n = length;
goto done;
@@ -1209,55 +1208,37 @@ read_x (st_parameter_dt *dtp, int n)
if (dtp->u.p.sf_seen_eor)
return;
- p = fbuf_read (dtp->u.p.current_unit, &length);
- if (p == NULL)
- {
- hit_eof (dtp);
- return;
- }
-
- if (length == 0 && dtp->u.p.item_count == 1)
- {
- if (dtp->u.p.current_unit->pad_status == PAD_NO)
- {
- hit_eof (dtp);
- return;
- }
- else
- return;
- }
-
n = 0;
while (n < length)
{
- q = *p;
- if (q == '\n' || q == '\r')
+ q = fbuf_getc (dtp->u.p.current_unit);
+ if (q == EOF)
+ break;
+ else if (q == '\n' || q == '\r')
{
/* Unexpected end of line. Set the position. */
- fbuf_seek (dtp->u.p.current_unit, n + 1 ,SEEK_CUR);
dtp->u.p.sf_seen_eor = 1;
+ /* If we see an EOR during non-advancing I/O, we need to skip
+ the rest of the I/O statement. Set the corresponding flag. */
+ if (dtp->u.p.advance_status == ADVANCE_NO || dtp->u.p.seen_dollar)
+ dtp->u.p.eor_condition = 1;
+
/* If we encounter a CR, it might be a CRLF. */
if (q == '\r') /* Probably a CRLF */
{
- /* See if there is an LF. Use fbuf_read rather then fbuf_getc so
- the position is not advanced unless it really is an LF. */
- int readlen = 1;
- p = fbuf_read (dtp->u.p.current_unit, &readlen);
- if (*p == '\n' && readlen == 1)
- {
- dtp->u.p.sf_seen_eor = 2;
- fbuf_seek (dtp->u.p.current_unit, 1 ,SEEK_CUR);
- }
+ /* See if there is an LF. */
+ q2 = fbuf_getc (dtp->u.p.current_unit);
+ if (q2 == '\n')
+ dtp->u.p.sf_seen_eor = 2;
+ else if (q2 != EOF) /* Oops, seek back. */
+ fbuf_seek (dtp->u.p.current_unit, -1, SEEK_CUR);
}
goto done;
}
n++;
- p++;
}
- fbuf_seek (dtp->u.p.current_unit, n, SEEK_CUR);
-
done:
if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
dtp->u.p.size_used += (GFC_IO_INT) n;
