From 9962e7fd037872c423544f61cba1c901b045363a Mon Sep 17 00:00:00 2001 From: guenther Date: Wed, 21 Oct 2009 16:04:23 +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. ok kurt@, earlier version tested by sthen@ and jj@ --- lib/libc/stdio/putc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/libc/stdio/putc.c') diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c index 925021549fb..571c7a70538 100644 --- a/lib/libc/stdio/putc.c +++ b/lib/libc/stdio/putc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: putc.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */ +/* $OpenBSD: putc.c,v 1.8 2009/10/21 16:04:23 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -60,8 +60,8 @@ putc(int c, FILE *fp) { int ret; - flockfile(fp); + FLOCKFILE(fp); ret = putc_unlocked(c, fp); - funlockfile(fp); + FUNLOCKFILE(fp); return (ret); } -- cgit v1.2.3-59-g8ed1b