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/getc.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/getc.c')
| -rw-r--r-- | lib/libc/stdio/getc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c index b77696c3d87..6879cbb7913 100644 --- a/lib/libc/stdio/getc.c +++ b/lib/libc/stdio/getc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getc.c,v 1.8 2009/10/22 01:23:16 guenther Exp $ */ +/* $OpenBSD: getc.c,v 1.9 2009/11/09 00:18:27 kurt Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -32,6 +32,7 @@ */ #include <stdio.h> +#include "local.h" /* * A subroutine version of the macro getc_unlocked. @@ -54,8 +55,8 @@ getc(FILE *fp) { int c; - flockfile(fp); + FLOCKFILE(fp); c = __sgetc(fp); - funlockfile(fp); + FUNLOCKFILE(fp); return (c); } |