diff options
| author |   guenther <guenther@openbsd.org> | 2009-10-21 16:04:23 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2009-10-21 16:04:23 +0000 |
| commit | 9962e7fd037872c423544f61cba1c901b045363a (patch) | |
| tree | ce799ea09983ba455c4a97b46913cf18ffa2a841 /lib/libc/stdio/vfprintf.c | |
| parent | "usage:" is lowercase; spacing. (diff) | |
| download | wireguard-openbsd-9962e7fd037872c423544f61cba1c901b045363a.tar.xz wireguard-openbsd-9962e7fd037872c423544f61cba1c901b045363a.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.
ok kurt@, earlier version tested by sthen@ and jj@
Diffstat (limited to 'lib/libc/stdio/vfprintf.c')
| -rw-r--r-- | lib/libc/stdio/vfprintf.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 7d7958b69df..2d3fb3ebe13 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfprintf.c,v 1.54 2009/10/16 12:15:03 martynas Exp $ */ +/* $OpenBSD: vfprintf.c,v 1.55 2009/10/21 16:04:23 guenther Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -130,8 +130,8 @@ __sbprintf(FILE *fp, const char *fmt, va_list ap) fake._lbfsize = 0; /* not actually used, but Just In Case */ /* do the work, then copy any error status */ - ret = vfprintf(&fake, fmt, ap); - if (ret >= 0 && fflush(&fake)) + ret = __vfprintf(&fake, fmt, ap); + if (ret >= 0 && __sflush(&fake)) ret = EOF; if (fake._flags & __SERR) fp->_flags |= __SERR; @@ -190,6 +190,17 @@ static int exponent(char *, int, int); int vfprintf(FILE *fp, const char *fmt0, __va_list ap) { + int ret; + + FLOCKFILE(fp); + ret = __vfprintf(fp, fmt0, ap); + FUNLOCKFILE(fp); + return (ret); +} + +int +__vfprintf(FILE *fp, const char *fmt0, __va_list ap) +{ char *fmt; /* format string */ int ch; /* character from fmt */ int n, n2; /* handy integers (short term usage) */ |