diff options
author | Daniel Eischen <deischen@FreeBSD.org> | 2001-02-11 22:06:43 +0000 |
---|---|---|
committer | Daniel Eischen <deischen@FreeBSD.org> | 2001-02-11 22:06:43 +0000 |
commit | 29ac6bd228d1c75dc4c19105fa149861bff04720 (patch) | |
tree | 91800b480f9efe4c0d90fe0b653e4bb1125f24f7 /lib/libc/stdio/fclose.c | |
parent | 5b62961a494b0271f6029f0c8f1e8c92a2267fe7 (diff) | |
download | src-29ac6bd228d1c75dc4c19105fa149861bff04720.tar.gz src-29ac6bd228d1c75dc4c19105fa149861bff04720.zip |
libc MT-safety, part 2.
Add a lock to FILE. flockfile and friends are now implemented
(for the most part) in libc. flockfile_debug is implemented in
libc_r; I suppose it's about time to kill it but will do it in
a future commit.
Fix a potential deadlock in _fwalk in a threaded environment.
A file flag (__SIGN) was added to stdio.h that, when set, tells
_fwalk to ignore it in its walk. This seemed to be needed in
refill.c because each file needs to be locked when flushing.
Add a stub for pthread_self in libc. This is needed by flockfile
which is allowed by POSIX to be recursive.
Make fgetpos() error return value (-1) match man page.
Remove recursive calls to locked functions (stdio); I think I've
got them all, but I may have missed a couple.
A few K&R -> ANSI conversions along with removal of a few instances
of "register".
$Id$ -> $FreeBSD$ in libc/stdio/rget.c
Not objected to: -arch, a few months ago
Notes
Notes:
svn path=/head/; revision=72373
Diffstat (limited to 'lib/libc/stdio/fclose.c')
-rw-r--r-- | lib/libc/stdio/fclose.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c index 0d6fd80cb92e..e70a2daa1b03 100644 --- a/lib/libc/stdio/fclose.c +++ b/lib/libc/stdio/fclose.c @@ -51,8 +51,7 @@ static const char rcsid[] = #include "local.h" int -fclose(fp) - FILE *fp; +fclose(FILE *fp) { int r; @@ -70,15 +69,9 @@ fclose(fp) FREEUB(fp); if (HASLB(fp)) FREELB(fp); - FUNLOCKFILE(fp); fp->_file = -1; fp->_r = fp->_w = 0; /* Mess up if reaccessed. */ -#if 0 - if (fp->_lock != NULL) { - _pthread_mutex_destroy((pthread_mutex_t *)&fp->_lock); - fp->_lock = NULL; - } -#endif fp->_flags = 0; /* Release this FILE for reuse. */ + FUNLOCKFILE(fp); return (r); } |