Add _flags2 per jhb@ suggestion since no room left in _flags.
Rewrite O_APPEND flag checking using new __S2OAP flag. MFC after: 3 weeks
This commit is contained in:
parent
c641ee4062
commit
64dac23af8
@ -144,6 +144,7 @@ struct __sFILE {
|
||||
int _fl_count; /* recursive lock count */
|
||||
int _orientation; /* orientation for fwide() */
|
||||
__mbstate_t _mbstate; /* multibyte conversion state */
|
||||
int _flags2; /* additional flags */
|
||||
};
|
||||
#ifndef _STDFILE_DECLARED
|
||||
#define _STDFILE_DECLARED
|
||||
@ -176,6 +177,8 @@ __END_DECLS
|
||||
#define __SALC 0x4000 /* allocate string space dynamically */
|
||||
#define __SIGN 0x8000 /* ignore this file in _fwalk */
|
||||
|
||||
#define __S2OAP 0x0001 /* O_APPEND mode is set */
|
||||
|
||||
/*
|
||||
* The following three definitions are for ANSI C, which took them
|
||||
* from System V, which brilliantly took internal interface macros and
|
||||
|
@ -91,9 +91,8 @@ fdopen(int fd, const char *mode)
|
||||
* O_APPEND bit set, assert __SAPP so that __swrite() caller
|
||||
* will _sseek() to the end before write.
|
||||
*/
|
||||
/* XXX: Reuse __SALC for O_APPEND. */
|
||||
if (fdflags & O_APPEND)
|
||||
fp->_flags |= __SALC;
|
||||
fp->_flags2 |= __S2OAP;
|
||||
else if (oflags & O_APPEND)
|
||||
fp->_flags |= __SAPP;
|
||||
fp->_file = fd;
|
||||
|
@ -155,6 +155,7 @@ __sfp(void)
|
||||
/* fp->_fl_mutex = NULL; */ /* once set always set (reused) */
|
||||
fp->_orientation = 0;
|
||||
memset(&fp->_mbstate, 0, sizeof(mbstate_t));
|
||||
fp->_flags2 = 0;
|
||||
return (fp);
|
||||
}
|
||||
|
||||
|
@ -92,8 +92,7 @@ fopen(const char * __restrict file, const char * __restrict mode)
|
||||
* fseek and ftell.)
|
||||
*/
|
||||
if (oflags & O_APPEND) {
|
||||
/* XXX: Reuse __SALC for O_APPEND. */
|
||||
fp->_flags |= __SALC;
|
||||
fp->_flags2 |= __S2OAP;
|
||||
(void)_sseek(fp, (fpos_t)0, SEEK_END);
|
||||
}
|
||||
return (fp);
|
||||
|
@ -187,6 +187,7 @@ freopen(const char * __restrict file, const char * __restrict mode,
|
||||
fp->_lb._size = 0;
|
||||
fp->_orientation = 0;
|
||||
memset(&fp->_mbstate, 0, sizeof(mbstate_t));
|
||||
fp->_flags2 = 0;
|
||||
|
||||
if (f < 0) { /* did not get it after all */
|
||||
if (isopen)
|
||||
@ -241,8 +242,7 @@ freopen(const char * __restrict file, const char * __restrict mode,
|
||||
* fseek and ftell.)
|
||||
*/
|
||||
if (oflags & O_APPEND) {
|
||||
/* XXX: Reuse __SALC for O_APPEND. */
|
||||
fp->_flags |= __SALC;
|
||||
fp->_flags2 |= __S2OAP;
|
||||
(void) _sseek(fp, (fpos_t)0, SEEK_END);
|
||||
}
|
||||
FUNLOCKFILE(fp);
|
||||
|
@ -119,8 +119,7 @@ _ftello(FILE *fp, fpos_t *offset)
|
||||
if (HASUB(fp))
|
||||
pos -= fp->_r; /* Can be negative at this point. */
|
||||
} else if ((fp->_flags & __SWR) && fp->_p != NULL) {
|
||||
/* XXX: Reuse __SALC for O_APPEND. */
|
||||
if (fp->_flags & (__SAPP|__SALC)) {
|
||||
if ((fp->_flags & __SAPP) || (fp->_flags2 & __S2OAP)) {
|
||||
int serrno = errno;
|
||||
|
||||
errno = 0;
|
||||
|
@ -117,8 +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) {
|
||||
/* XXX: Reuse __SALC for O_APPEND. */
|
||||
if ((fp->_flags & __SOFF) && !(fp->_flags & __SALC) &&
|
||||
if ((fp->_flags & __SOFF) && !(fp->_flags2 & __S2OAP) &&
|
||||
fp->_offset <= OFF_MAX - ret)
|
||||
fp->_offset += ret;
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user