From c5acf43a359ac8e21498420ba26e0d56c2821a31 Mon Sep 17 00:00:00 2001 From: kurt Date: Mon, 9 Nov 2009 00:18:27 +0000 Subject: Fix the handle locking in stdio to use flockfile/funlockfile internally when and where required. Macros in 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. --- lib/libc/stdio/getc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/libc/stdio/getc.c') 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 +#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); } -- cgit v1.2.3-59-g8ed1b