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.

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c
index 4563e011b6d..e8cd2490089 100644
--- a/lib/libc/stdio/fgetws.c
+++ b/lib/libc/stdio/fgetws.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fgetws.c,v 1.5 2009/11/08 16:55:17 stsp Exp $	*/
+/*	$OpenBSD: fgetws.c,v 1.6 2009/11/09 00:18:27 kurt Exp $	*/
 /* $NetBSD: fgetws.c,v 1.1 2003/03/07 07:11:37 tshiozak Exp $ */
 
 /*-
@@ -42,7 +42,7 @@ fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
 	wchar_t *wsp;
 	wint_t wc;
 
-	flockfile(fp);
+	FLOCKFILE(fp);
 	_SET_ORIENTATION(fp, 1);
 
 	if (n <= 0) {
@@ -69,11 +69,11 @@ fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
 	}
 
 	*wsp++ = L'\0';
-	funlockfile(fp);
+	FUNLOCKFILE(fp);
 
 	return (ws);
 
 error:
-	funlockfile(fp);
+	FUNLOCKFILE(fp);
 	return (NULL);
 }