summaryrefslogtreecommitdiffstats
path: root/newlib/libc/stdio/fclose.c
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2014-01-17 10:55:32 +0000
committerCorinna Vinschen <corinna@vinschen.de>2014-01-17 10:55:32 +0000
commit7a7e4d4d95e878c62ea5b642da864018b50aae21 (patch)
tree7256f4412958add20549f7c053e54b6df1f152cb /newlib/libc/stdio/fclose.c
parentae5b40a65bfc48f599a94dbfedb87f88ba6e831e (diff)
downloadcygnal-7a7e4d4d95e878c62ea5b642da864018b50aae21.tar.gz
cygnal-7a7e4d4d95e878c62ea5b642da864018b50aae21.tar.bz2
cygnal-7a7e4d4d95e878c62ea5b642da864018b50aae21.zip
Introduce _STDIO_BSD_SEMANTICS flag to switch fclose/exit file flushing
semantics from POSIX to BSD. * libc/stdio/fclose.c (_fclose_r): Conditionalize file flushing on _STDIO_BSD_SEMANTICS. Call __sflush_r rather than _fflush_r. Add comment. * libc/stdio/fflush.c (__sflushw_r): New function, only available if _STDIO_BSD_SEMANTICS is defined. * libc/stdio/findfp.c (_cleanup_r): Call _fwalk_reent rather than _fwalk. Conditionalize cleanup function call on _STDIO_BSD_SEMANTICS. Add comments. Add FIXME. * libc/stdio/local.h (__sflushw_r): Declare if _STDIO_BSD_SEMANTICS is defined.
Diffstat (limited to 'newlib/libc/stdio/fclose.c')
-rw-r--r--newlib/libc/stdio/fclose.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c
index fd054feaa..cd271c490 100644
--- a/newlib/libc/stdio/fclose.c
+++ b/newlib/libc/stdio/fclose.c
@@ -92,10 +92,15 @@ _DEFUN(_fclose_r, (rptr, fp),
#endif
return (0);
}
- /* Unconditionally flush to allow special handling for seekable read
- files to reposition file to last byte processed as opposed to
- last byte read ahead into the buffer. */
- r = _fflush_r (rptr, fp);
+#ifdef _STDIO_BSD_SEMANTICS
+ /* BSD and Glibc systems only flush streams which have been written to. */
+ r = (fp->_flags & __SWR) ? __sflush_r (rptr, fp) : 0;
+#else
+ /* Follow POSIX semantics exactly. Unconditionally flush to allow
+ special handling for seekable read files to reposition file to last
+ byte processed as opposed to last byte read ahead into the buffer. */
+ r = __sflush_r (rptr, fp);
+#endif
if (fp->_close != NULL && fp->_close (rptr, fp->_cookie) < 0)
r = EOF;
if (fp->_flags & __SMBF)