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/setvbuf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/libc/stdio/setvbuf.c') diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c index 9b92bf08113..21db80dbbdb 100644 --- a/lib/libc/stdio/setvbuf.c +++ b/lib/libc/stdio/setvbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setvbuf.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */ +/* $OpenBSD: setvbuf.c,v 1.9 2009/10/21 16:04:23 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -61,6 +61,7 @@ setvbuf(FILE *fp, char *buf, int mode, size_t size) * malloc()ed. We also clear any eof condition, as if this were * a seek. */ + FLOCKFILE(fp); ret = 0; (void)__sflush(fp); if (HASUB(fp)) @@ -107,6 +108,7 @@ nbf: fp->_w = 0; fp->_bf._base = fp->_p = fp->_nbuf; fp->_bf._size = 1; + FUNLOCKFILE(fp); return (ret); } flags |= __SMBF; @@ -145,6 +147,7 @@ nbf: /* begin/continue reading, or stay in intermediate state */ fp->_w = 0; } + FUNLOCKFILE(fp); __atexit_register_cleanup(_cleanup); return (ret); -- cgit v1.2.3-59-g8ed1b