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/vsnprintf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/libc/stdio/vsnprintf.c') diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c index e6dd009d106..5a08714075e 100644 --- a/lib/libc/stdio/vsnprintf.c +++ b/lib/libc/stdio/vsnprintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsnprintf.c,v 1.12 2006/01/06 18:53:04 millert Exp $ */ +/* $OpenBSD: vsnprintf.c,v 1.13 2009/10/21 16:04:23 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -58,7 +58,7 @@ vsnprintf(char *str, size_t n, const char *fmt, __va_list ap) f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = n - 1; - ret = vfprintf(&f, fmt, ap); + ret = __vfprintf(&f, fmt, ap); *f._p = '\0'; return (ret); } -- cgit v1.2.3-59-g8ed1b