/[mailutils]/mailutils/mailbox/stream.c
ViewVC logotype

Diff of /mailutils/mailbox/stream.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.27 by gray, Sun Feb 16 11:21:58 2003 UTC revision 1.28 by gray, Sun Mar 23 22:49:54 2003 UTC
# Line 186  stream_read (stream_t is, char *buf, siz Line 186  stream_read (stream_t is, char *buf, siz
186            /* Drain the buffer first.  */            /* Drain the buffer first.  */
187            if (is->rbuffer.count > 0 && offset == is->rbuffer.offset)            if (is->rbuffer.count > 0 && offset == is->rbuffer.offset)
188              {              {
189                (void)memcpy(buf, is->rbuffer.ptr, is->rbuffer.count);                memcpy(buf, is->rbuffer.ptr, is->rbuffer.count);
190                is->rbuffer.offset += is->rbuffer.count;                is->rbuffer.offset += is->rbuffer.count;
191                residue -= is->rbuffer.count;                residue -= is->rbuffer.count;
192                buf += is->rbuffer.count;                buf += is->rbuffer.count;
# Line 219  stream_read (stream_t is, char *buf, siz Line 219  stream_read (stream_t is, char *buf, siz
219        /* Drain the buffer, if we have less then requested.  */        /* Drain the buffer, if we have less then requested.  */
220        while (residue > (size_t)(r = is->rbuffer.count))        while (residue > (size_t)(r = is->rbuffer.count))
221          {          {
222            (void)memcpy (buf, is->rbuffer.ptr, (size_t)r);            memcpy (buf, is->rbuffer.ptr, (size_t)r);
223            /* stream->rbuffer.count = 0 ... done in refill */            /* stream->rbuffer.count = 0 ... done in refill */
224            is->rbuffer.ptr += r;            is->rbuffer.ptr += r;
225            is->rbuffer.offset += r;            is->rbuffer.offset += r;
# Line 246  stream_read (stream_t is, char *buf, siz Line 246  stream_read (stream_t is, char *buf, siz
246                return status;                return status;
247              }              }
248          }          }
249        (void)memcpy(buf, is->rbuffer.ptr, residue);        memcpy(buf, is->rbuffer.ptr, residue);
250        is->rbuffer.count -= residue;        is->rbuffer.count -= residue;
251        is->rbuffer.ptr += residue;        is->rbuffer.ptr += residue;
252        is->rbuffer.offset += residue;        is->rbuffer.offset += residue;
# Line 371  stream_readline (stream_t is, char *buf, Line 371  stream_readline (stream_t is, char *buf,
371                is->rbuffer.count -= len;                is->rbuffer.count -= len;
372                is->rbuffer.ptr = nl;                is->rbuffer.ptr = nl;
373                is->rbuffer.offset += len;                is->rbuffer.offset += len;
374                (void)memcpy ((void *)s, (void *)p, len);                memcpy ((void *)s, (void *)p, len);
375                total += len;                total += len;
376                s[len] = 0;                s[len] = 0;
377                if (pnread)                if (pnread)
# Line 381  stream_readline (stream_t is, char *buf, Line 381  stream_readline (stream_t is, char *buf,
381            is->rbuffer.count -= len;            is->rbuffer.count -= len;
382            is->rbuffer.ptr += len;            is->rbuffer.ptr += len;
383            is->rbuffer.offset += len;            is->rbuffer.offset += len;
384            (void)memcpy((void *)s, (void *)p, len);            memcpy((void *)s, (void *)p, len);
385            total += len;            total += len;
386            s += len;            s += len;
387            count -= len;            count -= len;

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.28

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26