diff options
| author | Kenny Root <kroot@google.com> | 2011-02-12 07:13:44 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2011-02-14 09:32:56 -0800 |
| commit | f582340a6a48588aa50da17e1620e8f91b146941 (patch) | |
| tree | d30c0ffb648b7a43ff469f89f05850f5008482ec /libc/stdio/freopen.c | |
| parent | 72f9a5c374bf559e9c69a62c1d95304f913ef6b2 (diff) | |
| download | android_bionic-f582340a6a48588aa50da17e1620e8f91b146941.tar.gz android_bionic-f582340a6a48588aa50da17e1620e8f91b146941.tar.bz2 android_bionic-f582340a6a48588aa50da17e1620e8f91b146941.zip | |
Fix the handle locking in stdio
Fix the handle locking in stdio to use flockfile/funlockfile
internally when and where required. Macros in <stdio.h> are updated
to automatically call the underlying functions when the process is
threaded to obtain the necessary locking. A private mutex is added
to protect __sglue, the internal list of FILE handles, and another
to protect the one-time initialization. Some routines in libc that
use getc() change to use getc_unlocked() as they're either protected
by their own lock or aren't thread-safe routines anyway.
Based on OpenBSD change by guenther@openbsd.org
http://www.mail-archive.com/source-changes@cvs.openbsd.org/msg01015.html
Bug: 3446659
Change-Id: Ie82116e358c541718d6709ec45ca6796be5a007b
Diffstat (limited to 'libc/stdio/freopen.c')
| -rw-r--r-- | libc/stdio/freopen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libc/stdio/freopen.c b/libc/stdio/freopen.c index 59b222864..da3a674c9 100644 --- a/libc/stdio/freopen.c +++ b/libc/stdio/freopen.c @@ -59,6 +59,8 @@ freopen(const char *file, const char *mode, FILE *fp) if (!__sdidinit) __sinit(); + FLOCKFILE(fp); + /* * There are actually programs that depend on being able to "freopen" * descriptors that weren't originally open. Keep this from breaking. @@ -120,6 +122,7 @@ freopen(const char *file, const char *mode, FILE *fp) if (f < 0) { /* did not get it after all */ fp->_flags = 0; /* set it free */ + FUNLOCKFILE(fp); errno = sverrno; /* restore in case _close clobbered */ return (NULL); } @@ -154,5 +157,6 @@ freopen(const char *file, const char *mode, FILE *fp) */ if (oflags & O_APPEND) (void) __sseek((void *)fp, (fpos_t)0, SEEK_END); + FUNLOCKFILE(fp); return (fp); } |