From e3cd6c5c265cd481db6e0c5b529855d99f0bda30 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 28 Mar 2011 01:14:44 -0400 Subject: major stdio overhaul, using readv/writev, plus other changes the biggest change in this commit is that stdio now uses readv to fill the caller's buffer and the FILE buffer with a single syscall, and likewise writev to flush the FILE buffer and write out the caller's buffer in a single syscall. making this change required fundamental architectural changes to stdio, so i also made a number of other improvements in the process: - the implementation no longer assumes that further io will fail following errors, and no longer blocks io when the error flag is set (though the latter could easily be changed back if desired) - unbuffered mode is no longer implemented as a one-byte buffer. as a consequence, scanf unreading has to use ungetc, to the unget buffer has been enlarged to hold at least 2 wide characters. - the FILE structure has been rearranged to maintain the locations of the fields that might be used in glibc getc/putc type macros, while shrinking the structure to save some space. - error cases for fflush, fseek, etc. should be more correct. - library-internal macros are used for getc_unlocked and putc_unlocked now, eliminating some ugly code duplication. __uflow and __overflow are no longer used anywhere but these macros. switch to read or write mode is also separated so the code can be better shared, e.g. with ungetc. - lots of other small things. --- src/stdio/getdelim.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/stdio/getdelim.c') diff --git a/src/stdio/getdelim.c b/src/stdio/getdelim.c index f770d20b..20d345d1 100644 --- a/src/stdio/getdelim.c +++ b/src/stdio/getdelim.c @@ -8,6 +8,7 @@ ssize_t getdelim(char **s, size_t *n, int delim, FILE *f) unsigned char *z; size_t k; size_t i=0; + int c; if (!n || !s) { errno = EINVAL; @@ -18,16 +19,16 @@ ssize_t getdelim(char **s, size_t *n, int delim, FILE *f) FLOCK(f); - while (!feof(f)) { + for (;;) { z = memchr(f->rpos, delim, f->rend - f->rpos); k = z ? z - f->rpos + 1 : f->rend - f->rpos; if (i+k >= *n) { - if (k >= SIZE_MAX-i) goto oom; - *n = i+k+1; - if (*n < SIZE_MAX/2) *n *= 2; + if (k >= SIZE_MAX/2-i) goto oom; + *n = i+k+2; + if (*n < SIZE_MAX/4) *n *= 2; tmp = realloc(*s, *n); if (!tmp) { - *n = i+k+1; + *n = i+k+2; tmp = realloc(*s, *n); if (!tmp) goto oom; } @@ -37,23 +38,22 @@ ssize_t getdelim(char **s, size_t *n, int delim, FILE *f) f->rpos += k; i += k; if (z) break; - __underflow(f); + if ((c = getc_unlocked(f)) == EOF) { + if (!i || !feof(f)) { + FUNLOCK(f); + return -1; + } + break; + } + if (((*s)[i++] = c) == delim) break; } (*s)[i] = 0; - if (feof(f) || ferror(f)) { - FUNLOCK(f); - return -1; - } FUNLOCK(f); - if (i > SSIZE_MAX) { - errno = EOVERFLOW; - return -1; - } - return i; oom: + FUNLOCK(f); errno = ENOMEM; return -1; } -- cgit v1.2.1