move __stdio_exit_needed to stdio_impl.h

[musl] / src / stdio / __toread.c

diff --git a/src/stdio/__toread.c b/src/stdio/__toread.c
index 52624f3..8f9f27b 100644 (file)
--- a/src/stdio/__toread.c
+++ b/src/stdio/__toread.c
@@ -3,18 +3,16 @@
 int __toread(FILE *f)
 {
        f->mode |= f->mode-1;
-       if (f->wpos > f->buf) f->write(f, 0, 0);
+       if (f->wpos > f->wbase) f->write(f, 0, 0);
        f->wpos = f->wbase = f->wend = 0;
-       if (f->flags & (F_EOF|F_NORD)) {
-               if (f->flags & F_NORD) f->flags |= F_ERR;
+       if (f->flags & F_NORD) {
+               f->flags |= F_ERR;
                return EOF;
        }
-       f->rpos = f->rend = f->buf;
-       return 0;
+       f->rpos = f->rend = f->buf + f->buf_size;
+       return (f->flags & F_EOF) ? EOF : 0;
 }
 
-void __stdio_exit_needed(void);
-
 void __toread_needs_stdio_exit()
 {
        __stdio_exit_needed();