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/fputs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/libc/stdio/fputs.c') diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c index 7434ca86d64..4a861fa66b9 100644 --- a/lib/libc/stdio/fputs.c +++ b/lib/libc/stdio/fputs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fputs.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */ +/* $OpenBSD: fputs.c,v 1.8 2009/10/21 16:04:23 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -44,11 +44,15 @@ fputs(const char *s, FILE *fp) { struct __suio uio; struct __siov iov; + int ret; iov.iov_base = (void *)s; iov.iov_len = uio.uio_resid = strlen(s); uio.uio_iov = &iov; uio.uio_iovcnt = 1; + FLOCKFILE(fp); _SET_ORIENTATION(fp, -1); - return (__sfvwrite(fp, &uio)); + ret = __sfvwrite(fp, &uio); + FUNLOCKFILE(fp); + return (ret); } -- cgit v1.2.3-59-g8ed1b