diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2009-10-21 16:04:24 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2009-10-21 16:04:24 +0000 |
| commit | 41f63f502ca80eb7786b814aad26bbb067f253ce (patch) | |
| tree | d43150b93956d00bef9acc8b52e692aa590aca5b /lib/libc/stdio/fgetwc.c | |
| parent | 99b8328b2511887d52f6373c2338c996ffac1768 (diff) | |
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.
ok kurt@, earlier version tested by sthen@ and jj@
Diffstat (limited to 'lib/libc/stdio/fgetwc.c')
| -rw-r--r-- | lib/libc/stdio/fgetwc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/stdio/fgetwc.c b/lib/libc/stdio/fgetwc.c index 8da50877264..0ab5cb78200 100644 --- a/lib/libc/stdio/fgetwc.c +++ b/lib/libc/stdio/fgetwc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fgetwc.c,v 1.1 2005/06/17 20:40:32 espie Exp $ */ +/* $OpenBSD: fgetwc.c,v 1.2 2009/10/21 16:04:23 guenther Exp $ */ /* $NetBSD: fgetwc.c,v 1.3 2003/03/07 07:11:36 tshiozak Exp $ */ /*- @@ -82,9 +82,9 @@ fgetwc(FILE *fp) { wint_t r; - flockfile(fp); + FLOCKFILE(fp); r = __fgetwc_unlock(fp); - funlockfile(fp); + FUNLOCKFILE(fp); return (r); } |