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/fputws.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/libc/stdio/fputws.c') diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c index a54ee669608..d2163affc36 100644 --- a/lib/libc/stdio/fputws.c +++ b/lib/libc/stdio/fputws.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fputws.c,v 1.2 2005/08/08 08:05:36 espie Exp $ */ +/* $OpenBSD: fputws.c,v 1.3 2009/10/21 16:04:23 guenther Exp $ */ /* $NetBSD: fputws.c,v 1.1 2003/03/07 07:11:37 tshiozak Exp $ */ /*- @@ -40,17 +40,17 @@ fputws(ws, fp) const wchar_t * __restrict ws; FILE * __restrict fp; { - flockfile(fp); + FLOCKFILE(fp); _SET_ORIENTATION(fp, 1); while (*ws != '\0') { if (__fputwc_unlock(*ws++, fp) == WEOF) { - funlockfile(fp); + FUNLOCKFILE(fp); return (-1); } } - funlockfile(fp); + FUNLOCKFILE(fp); return (0); } -- cgit v1.2.3-59-g8ed1b