X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fstdio%2Fungetc.c;h=7f56f8d5f07b79dba384f9ef02fe2b8c160b6467;hp=0718168427603259924da29e38e4fb8d30b49302;hb=e3cd6c5c265cd481db6e0c5b529855d99f0bda30;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01 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;