d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file == NULL:

Browse Source 
Issue __sflush() before possible setting O_APPEND mode or ftruncate(),
write to wrong place may occurse oserwise.
Use simplified _sseek() to the start, if no O_APPEND is set, instead
of _fseeko() (_sseek() to the end, if O_APPEND, occurse later, as for
file != NULL).
Don't check seek error return, as original fopen() and freopen() never
does.

file != NULL:
Add missing _sseek() to the end.
This commit is contained in:
ache 2006-10-16 14:31:56 +00:00
parent 26039aabd1
commit 9a7ddac59a
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libc/stdio/freopen.c
View File

@ -104,6 +104,8 @@ freopen(file, mode, fp)
errno = EINVAL; errno = EINVAL;
return (NULL); return (NULL);
} }
if (fp->_flags & __SWR)
(void) __sflush(fp);
if ((oflags ^ dflags) & O_APPEND) { if ((oflags ^ dflags) & O_APPEND) {
dflags &= ~O_APPEND; dflags &= ~O_APPEND;
dflags |= oflags & O_APPEND; dflags |= oflags & O_APPEND;
@ -117,15 +119,8 @@ freopen(file, mode, fp)
} }
if (oflags & O_TRUNC) if (oflags & O_TRUNC)
(void) ftruncate(fp->_file, (off_t)0); (void) ftruncate(fp->_file, (off_t)0);
fp->_flags |= __SNPT; /* real seek */ if (!(oflags & O_APPEND))
if (_fseeko(fp, (off_t)0, oflags & O_APPEND ? SEEK_END : SEEK_SET, (void) _sseek(fp, (fpos_t)0, SEEK_SET);
0) < 0 && errno != ESPIPE) {
sverrno = errno;
fclose(fp);
FUNLOCKFILE(fp);
errno = sverrno;
return (NULL);
}
f = fp->_file; f = fp->_file;
isopen = 0; isopen = 0;
wantfd = -1; wantfd = -1;
@ -219,6 +214,16 @@ finish:
fp->_write = __swrite; fp->_write = __swrite;
fp->_seek = __sseek; fp->_seek = __sseek;
fp->_close = __sclose; fp->_close = __sclose;
/*
* When opening in append mode, even though we use O_APPEND,
* we need to seek to the end so that ftell() gets the right
* answer. If the user then alters the seek pointer, or
* the file extends, this will fail, but there is not much
* we can do about this. (We could set __SAPP and check in
* fseek and ftell.)
*/
if (oflags & O_APPEND)
(void) _sseek(fp, (fpos_t)0, SEEK_END);
FUNLOCKFILE(fp); FUNLOCKFILE(fp);
return (fp); return (fp);
} }