author | Rich Felker <dalias@aerifal.cx> | 2011年03月28日 01:14:44 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2011年03月28日 01:14:44 -0400 |
commit | e3cd6c5c265cd481db6e0c5b529855d99f0bda30 (patch) | |
tree | 85d2c586e4ea8e261ed68cc4b1901a1711774441 /src/stdio/ungetc.c | |
parent | ea343364a719add2cd8adf8a50c15bb5f9400dd8 (diff) | |
download | musl-e3cd6c5c265cd481db6e0c5b529855d99f0bda30.tar.gz |
-rw-r--r-- | src/stdio/ungetc.c | 16 |
diff --git a/src/stdio/ungetc.c b/src/stdio/ungetc.c index 07181684..7f56f8d5 100644 --- a/src/stdio/ungetc.c +++ b/src/stdio/ungetc.c @@ -6,25 +6,11 @@ int ungetc(int c, FILE *f) FLOCK(f); - /* Fail if unreadable or writing and unable to flush */ - if ((f->flags & (F_ERR|F_NORD)) || (f->wpos && __oflow(f))) { + if ((!f->rend && __toread(f)) || f->rpos <= f->buf - UNGET) { FUNLOCK(f); return EOF; } - /* Clear write mode */ - f->wbase = f->wpos = f->wstop = f->wend = 0; - - /* Put the file in read mode */ - if (!f->rpos) f->rpos = f->rend = f->buf; - - /* If unget buffer is already full, fail. */ - if (f->rpos <= f->buf - UNGET) { - FUNLOCK(f); - return EOF; - } - - /* Put a byte back into the buffer */ *--f->rpos = c; f->flags &= ~F_EOF; |