diff options
| author |   kurt <kurt@openbsd.org> | 2009-11-09 00:18:27 +0000 |
|---|---|---|
| committer | kurt <kurt@openbsd.org> | 2009-11-09 00:18:27 +0000 |
| commit | c5acf43a359ac8e21498420ba26e0d56c2821a31 (patch) | |
| tree | aea05e2f1bc3a9156f2e6099880b0eb623c7e4e5 /lib/libc/stdio/refill.c | |
| parent | forwards_get() also calls alias_to_expand_node() (diff) | |
| download | wireguard-openbsd-c5acf43a359ac8e21498420ba26e0d56c2821a31.tar.xz wireguard-openbsd-c5acf43a359ac8e21498420ba26e0d56c2821a31.zip | |
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.
committing on behalf of and okay guenther@ now that we have install
media space available.
Diffstat (limited to 'lib/libc/stdio/refill.c')
| -rw-r--r-- | lib/libc/stdio/refill.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c index 8b690b46b25..165c72a64ba 100644 --- a/lib/libc/stdio/refill.c +++ b/lib/libc/stdio/refill.c @@ -1,4 +1,4 @@ -/* $OpenBSD: refill.c,v 1.10 2009/10/22 01:23:16 guenther Exp $ */ +/* $OpenBSD: refill.c,v 1.11 2009/11/09 00:18:27 kurt Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -39,9 +39,8 @@ static int lflush(FILE *fp) { - if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR)) - return (__sflush(fp)); + return (__sflush_locked(fp)); /* ignored... */ return (0); } @@ -103,8 +102,16 @@ __srefill(FILE *fp) * flush all line buffered output files, per the ANSI C * standard. */ - if (fp->_flags & (__SLBF|__SNBF)) + if (fp->_flags & (__SLBF|__SNBF)) { + /* Ignore this file in _fwalk to avoid potential deadlock. */ + fp->_flags |= __SIGN; (void) _fwalk(lflush); + fp->_flags &= ~__SIGN; + + /* Now flush this file without locking it. */ + if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR)) + __sflush(fp); + } fp->_p = fp->_bf._base; fp->_r = (*fp->_read)(fp->_cookie, (char *)fp->_p, fp->_bf._size); fp->_flags &= ~__SMOD; /* buffer contents are again pristine */ |