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/puts.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lib/libc/stdio/puts.c') diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c index c6ecc24f1a8..a3957b3b234 100644 --- a/lib/libc/stdio/puts.c +++ b/lib/libc/stdio/puts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: puts.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */ +/* $OpenBSD: puts.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. @@ -33,6 +33,7 @@ #include #include +#include "local.h" #include "fvwrite.h" /* @@ -44,6 +45,7 @@ puts(const char *s) size_t c = strlen(s); struct __suio uio; struct __siov iov[2]; + int ret; iov[0].iov_base = (void *)s; iov[0].iov_len = c; @@ -52,5 +54,8 @@ puts(const char *s) uio.uio_resid = c + 1; uio.uio_iov = &iov[0]; uio.uio_iovcnt = 2; - return (__sfvwrite(stdout, &uio) ? EOF : '\n'); + FLOCKFILE(stdout); + ret = __sfvwrite(stdout, &uio); + FUNLOCKFILE(stdout); + return (ret ? EOF : '\n'); } -- cgit v1.2.3-59-g8ed1b