diff options
| author |   guenther <guenther@openbsd.org> | 2009-10-21 16:04:23 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2009-10-21 16:04:23 +0000 |
| commit | 9962e7fd037872c423544f61cba1c901b045363a (patch) | |
| tree | ce799ea09983ba455c4a97b46913cf18ffa2a841 /lib/libc/stdio/fwide.c | |
| parent | "usage:" is lowercase; spacing. (diff) | |
| download | wireguard-openbsd-9962e7fd037872c423544f61cba1c901b045363a.tar.xz wireguard-openbsd-9962e7fd037872c423544f61cba1c901b045363a.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.
ok kurt@, earlier version tested by sthen@ and jj@
Diffstat (limited to 'lib/libc/stdio/fwide.c')
| -rw-r--r-- | lib/libc/stdio/fwide.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/stdio/fwide.c b/lib/libc/stdio/fwide.c index 6fd31b0e73e..b15a14f2375 100644 --- a/lib/libc/stdio/fwide.c +++ b/lib/libc/stdio/fwide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fwide.c,v 1.1 2005/06/17 20:40:32 espie Exp $ */ +/* $OpenBSD: fwide.c,v 1.2 2009/10/21 16:04:23 guenther Exp $ */ /* $NetBSD: fwide.c,v 1.2 2003/01/18 11:29:54 thorpej Exp $ */ /*- @@ -49,7 +49,7 @@ fwide(FILE *fp, int mode) else if (mode < 0) mode = -1; - flockfile(fp); + FLOCKFILE(fp); wcio = WCIO_GET(fp); if (!wcio) return 0; /* XXX */ @@ -58,7 +58,7 @@ fwide(FILE *fp, int mode) wcio->wcio_mode = mode; else mode = wcio->wcio_mode; - funlockfile(fp); + FUNLOCKFILE(fp); return mode; } |