diff options
| author | Eric Blake <eblake@redhat.com> | 2007-07-13 20:37:53 +0000 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2007-07-13 20:37:53 +0000 |
| commit | 08146e5adbceb673cc2c6c4adee05ba37f709095 (patch) | |
| tree | 2bda91075f62fa6b54750cca0346838ebf1a9f28 /newlib/libc/stdio/fseek.c | |
| parent | b71fb40215c79d607d8f24dc6af0c28d5ce9ccaf (diff) | |
| download | cygnal-08146e5adbceb673cc2c6c4adee05ba37f709095.tar.gz cygnal-08146e5adbceb673cc2c6c4adee05ba37f709095.tar.bz2 cygnal-08146e5adbceb673cc2c6c4adee05ba37f709095.zip | |
Fix fflush issues.
* libc/stdio/fflush.c (_fflush_r): New function.
(fflush): Fix reentrancy and large offset behavior.
* libc/include/stdio.h (_fflush_r): Add prototype.
* libc/stdio/fclose.c (_fclose_r): All fflush callers changed.
* libc/stdio/freopen.c (_freopen_r): Likewise.
* libc/stdio/fseek.c (_fseek_r): Likewise.
* libc/stdio/ftell.c (_ftell_r): Likewise.
* libc/stdio/fvwrite.c (__sfvwrite_r): Likewise.
* libc/stdio/refill.c (__srefill_r): Likewise.
* libc/stdio/setvbuf.c (setvbuf): Likewise.
* libc/stdio/ungetc.c (_ungetc_r): Likewise.
* libc/stdio/vfprintf.c (__sbprintf): Likewise.
* libc/stdio/wbuf.c (__swbuf_r): Likewise.
* libc/stdio64/freopen64.c (_freopen64_r): Likewise.
* libc/stdio64/fseeko64.c (_fseeko64_r): Likewise. Defer to
32-bit version if not large file.
* libc/stdio64/ftello64.c (_ftello64_r): Likewise.
* libc/stdio64/tmpfile64.c (_tmpfile64_r): Avoid compile warning.
Diffstat (limited to 'newlib/libc/stdio/fseek.c')
| -rw-r--r-- | newlib/libc/stdio/fseek.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c index 028c62a3f..569bad742 100644 --- a/newlib/libc/stdio/fseek.c +++ b/newlib/libc/stdio/fseek.c @@ -145,7 +145,7 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence), if (fp->_flags & __SAPP && fp->_flags & __SWR) { /* So flush the buffer and seek to the end. */ - fflush (fp); + _fflush_r (ptr, fp); } /* Have to be able to seek. */ @@ -170,7 +170,7 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence), * we have to first find the current stream offset a la * ftell (see ftell for details). */ - fflush (fp); /* may adjust seek offset on append stream */ + _fflush_r (ptr, fp); /* may adjust seek offset on append stream */ if (fp->_flags & __SOFF) curoff = fp->_offset; else @@ -356,7 +356,8 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence), */ dumb: - if (fflush (fp) || seekfn (ptr, fp->_cookie, offset, whence) == POS_ERR) + if (_fflush_r (ptr, fp) + || seekfn (ptr, fp->_cookie, offset, whence) == POS_ERR) { _funlockfile (fp); return EOF; |