diff options
| author | ache <ache@FreeBSD.org> | 2015-11-08 13:37:16 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2015-11-08 13:37:16 +0000 |
| commit | 8a3e4a6db71e690b2b8bf5f3372f4f99a506fdd7 (patch) | |
| tree | 20f498bd623fab85c76c978a69e059c9bda125d0 /lib/libc/stdio/stdio.c | |
| parent | 1df83ba3d3bc30d9297c344788b7ce3dbe3eb69b (diff) | |
| download | FreeBSD-src-8a3e4a6db71e690b2b8bf5f3372f4f99a506fdd7.zip FreeBSD-src-8a3e4a6db71e690b2b8bf5f3372f4f99a506fdd7.tar.gz | |
MFC: r289863,r289931,r290110,r290230,r290231,r290232
r290232:
Microoptimize.
r290231:
Addition to prev. commit.
In some edge cases fp->_p can be changed in _sseek(), recalculate.
r290230:
Don't seek to the end if write buffer is empty (in append modes).
PR: 204156
r290110:
Add _flags2 per jhb@ suggestion since no room left in _flags.
Rewrite O_APPEND flag checking using new __S2OAP flag.
r289931:
According to POSIX, a write operation shall start at the current size of
the stream (if mode had 'a' as the first character).
r289863:
Since no room left in the _flags, reuse __SALC for O_APPEND.
It helps to remove _fcntl() call from _ftello() and optimize seek position
calculation in _swrite().
Diffstat (limited to 'lib/libc/stdio/stdio.c')
| -rw-r--r-- | lib/libc/stdio/stdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c index 44ee0ab..5d6fb9a 100644 --- a/lib/libc/stdio/stdio.c +++ b/lib/libc/stdio/stdio.c @@ -117,7 +117,7 @@ _swrite(FILE *fp, char const *buf, int n) ret = (*fp->_write)(fp->_cookie, buf, n); /* __SOFF removed even on success in case O_APPEND mode is set. */ if (ret >= 0) { - if ((fp->_flags & (__SAPP|__SOFF)) == (__SAPP|__SOFF) && + if ((fp->_flags & __SOFF) && !(fp->_flags2 & __S2OAP) && fp->_offset <= OFF_MAX - ret) fp->_offset += ret; else |
