generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the handle locking in stdio

Browse Source 
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
This commit is contained in:
Kenny Root
2011-02-12 07:13:44 -08:00
parent 72f9a5c374
commit f582340a6a
36 changed files with 239 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libc/stdio/vfprintf.c
View File

@@ -100,8 +100,8 @@ __sbprintf(FILE *fp, const char *fmt, va_list ap)
fake._lbfsize = 0; /* not actually used, but Just In Case */
/* do the work, then copy any error status */
ret = vfprintf(&fake, fmt, ap);
if (ret >= 0 && fflush(&fake))
ret = __vfprintf(&fake, fmt, ap);
if (ret >= 0 && __sflush(&fake))
ret = EOF;
if (fake._flags & __SERR)
fp->_flags |= __SERR;
@@ -157,6 +157,17 @@ static int _my_isnan(double);
int
vfprintf(FILE *fp, const char *fmt0, __va_list ap)
{
int ret;
FLOCKFILE(fp);
ret = __vfprintf(fp, fmt0, ap);
FUNLOCKFILE(fp);
return (ret);
}
int
__vfprintf(FILE *fp, const char *fmt0, __va_list ap)
{
char *fmt; /* format string */
int ch; /* character from fmt */