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/ungetwc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/libc/stdio/ungetwc.c') diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c index 06f78c07a60..60bee069f52 100644 --- a/lib/libc/stdio/ungetwc.c +++ b/lib/libc/stdio/ungetwc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ungetwc.c,v 1.3 2009/10/22 01:23:16 guenther Exp $ */ +/* $OpenBSD: ungetwc.c,v 1.4 2009/11/09 00:18:27 kurt Exp $ */ /* $NetBSD: ungetwc.c,v 1.2 2003/01/18 11:29:59 thorpej Exp $ */ /*- @@ -42,7 +42,7 @@ ungetwc(wint_t wc, FILE *fp) if (wc == WEOF) return WEOF; - flockfile(fp); + FLOCKFILE(fp); _SET_ORIENTATION(fp, 1); /* * XXX since we have no way to transform a wchar string to @@ -52,19 +52,19 @@ ungetwc(wint_t wc, FILE *fp) wcio = WCIO_GET(fp); if (wcio == 0) { - funlockfile(fp); + FUNLOCKFILE(fp); errno = ENOMEM; /* XXX */ return WEOF; } if (wcio->wcio_ungetwc_inbuf >= WCIO_UNGETWC_BUFSIZE) { - funlockfile(fp); + FUNLOCKFILE(fp); return WEOF; } wcio->wcio_ungetwc_buf[wcio->wcio_ungetwc_inbuf++] = wc; __sclearerr(fp); - funlockfile(fp); + FUNLOCKFILE(fp); return wc; } -- cgit v1.2.3-59-g8ed1b