diff options
| author |   kurt <kurt@openbsd.org> | 2009-11-09 00:18:27 +0000 |
|---|---|---|
| committer | kurt <kurt@openbsd.org> | 2009-11-09 00:18:27 +0000 |
| commit | c5acf43a359ac8e21498420ba26e0d56c2821a31 (patch) | |
| tree | aea05e2f1bc3a9156f2e6099880b0eb623c7e4e5 /lib/libc/stdio/fvwrite.c | |
| parent | forwards_get() also calls alias_to_expand_node() (diff) | |
| download | wireguard-openbsd-c5acf43a359ac8e21498420ba26e0d56c2821a31.tar.xz wireguard-openbsd-c5acf43a359ac8e21498420ba26e0d56c2821a31.zip | |
Fix the handle locking in stdio to use flockfile/funlockfile
internally when and where required. Macros in <stdio.h> 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.
Diffstat (limited to 'lib/libc/stdio/fvwrite.c')
| -rw-r--r-- | lib/libc/stdio/fvwrite.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index 9e916afddf5..1088991fd59 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fvwrite.c,v 1.16 2009/10/22 01:23:16 guenther Exp $ */ +/* $OpenBSD: fvwrite.c,v 1.17 2009/11/09 00:18:27 kurt Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -134,7 +134,7 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ /* unneeded */ fp->_p += w; - if (fflush(fp)) + if (__sflush(fp)) goto err; } else if (len >= (w = fp->_bf._size)) { /* write directly */ @@ -174,7 +174,7 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ fp->_p += w; - if (fflush(fp)) + if (__sflush(fp)) goto err; } else if (s >= (w = fp->_bf._size)) { w = (*fp->_write)(fp->_cookie, p, w); @@ -188,7 +188,7 @@ __sfvwrite(FILE *fp, struct __suio *uio) } if ((nldist -= w) == 0) { /* copied the newline: flush and forget */ - if (fflush(fp)) + if (__sflush(fp)) goto err; nlknown = 0; } |