diff options
author | Robert de Bath <rdebath@poboxes.com> | 1997-05-09 19:36:29 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2013-10-23 23:39:48 +0200 |
commit | e63c244cb22bf48ca1d2695784a072269d19ea96 (patch) | |
tree | 45b9018259f43db629b27395783cf48e55a85eee /libc/stdio2/stdio.c | |
parent | 4c36e9a0c125ccfff37aa440dab2cf58c4152fff (diff) | |
download | dev86-e63c244cb22bf48ca1d2695784a072269d19ea96.tar.gz |
Import Dev86src-0.12.0.tar.gzv0.12.0
Diffstat (limited to 'libc/stdio2/stdio.c')
-rw-r--r-- | libc/stdio2/stdio.c | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/libc/stdio2/stdio.c b/libc/stdio2/stdio.c index 156d3e3..210c41f 100644 --- a/libc/stdio2/stdio.c +++ b/libc/stdio2/stdio.c @@ -207,7 +207,8 @@ int fflush(fp) FILE *fp; { - int len, cc; + int len, cc, rv=0; + char * bstart; if (fp == NULL) /* On NULL flush the lot. */ { if (fflush(stdin)) @@ -231,24 +232,29 @@ FILE *fp; if (len) { + bstart = fp->bufstart; /* - * The loop is so we don't get upset by signals + * The loop is so we don't get upset by signals or partial writes. */ do { - cc = write(fp->fd, fp->bufstart, len); + cc = write(fp->fd, bstart, len); + if( cc > 0 ) + { + bstart+=cc; len-=cc; + } } - while (cc == -1 && errno == EINTR); + while ( cc>0 || (cc == -1 && errno == EINTR)); /* - * I think the following test is _too_ stringent, but it's not - * serious If it is found to be a problem then if cc>0 we can do - * a memcpy to put the buffer in a state for a retry. Or even do - * the retry ourselves. + * If we get here with len!=0 there was an error, exactly what to + * do about it is another matter ... + * + * I'll just clear the buffer. */ - if (cc != len) + if (len) { fp->mode |= __MODE_ERR; - return EOF; + rv = EOF; } } } @@ -260,7 +266,7 @@ FILE *fp; len = fp->bufread - fp->bufpos; /* Bytes buffered but unread */ /* If it's a file, make it good */ - if (len > 0 && lseek(fp->fd, -len, 1) < 0) + if (len > 0 && lseek(fp->fd, (long)-len, 1) < 0) { /* Hummm - Not certain here, I don't think this is reported */ /* @@ -272,7 +278,7 @@ FILE *fp; /* All done, no problem */ fp->mode &= (~(__MODE_READING|__MODE_WRITING|__MODE_EOF|__MODE_UNGOT)); fp->bufread = fp->bufwrite = fp->bufpos = fp->bufstart; - return 0; + return rv; } #endif @@ -475,12 +481,21 @@ FILE *fp; else /* Too big for the buffer */ { - put = write(fp->fd, buf, bytes); - if (put < 0) + put = bytes; + do { - fp->mode |= __MODE_ERR; - put = 0; + len = write(fp->fd, buf, bytes); + if( len > 0 ) + { + buf+=len; bytes-=len; + } } + while (len > 0 || (len == -1 && errno == EINTR)); + + if (len < 0) + fp->mode |= __MODE_ERR; + + put -= bytes; } return put / size; @@ -504,8 +519,6 @@ FILE *fp; long offset; int ref; { - /* Use fflush to sync the pointers */ - #if 1 /* if __MODE_READING and no ungetc ever done can just move pointer */ /* This needs testing! */ @@ -532,6 +545,8 @@ int ref; } #endif + /* Use fflush to sync the pointers */ + if (fflush(fp) == EOF) return EOF; if (lseek(fp->fd, offset, ref) < 0) |