diff options
author | Kurt Miller <kurt@cvs.openbsd.org> | 2009-11-09 00:18:29 +0000 |
---|---|---|
committer | Kurt Miller <kurt@cvs.openbsd.org> | 2009-11-09 00:18:29 +0000 |
commit | ad0592d657a970d3b3d8200773732a354fad0461 (patch) | |
tree | 2d36a0624d8d3c7fac96e04ac86511d85bbcc56f /lib/libc/stdio/sprintf.c | |
parent | 13102e76b8d893f7a1f4a778cc16d5e67e719a12 (diff) |
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/sprintf.c')
-rw-r--r-- | lib/libc/stdio/sprintf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c index 4e9cd37a7c5..faa7c73ca20 100644 --- a/lib/libc/stdio/sprintf.c +++ b/lib/libc/stdio/sprintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sprintf.c,v 1.15 2009/10/22 01:23:16 guenther Exp $ */ +/* $OpenBSD: sprintf.c,v 1.16 2009/11/09 00:18:27 kurt Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -56,7 +56,7 @@ sprintf(char *str, const char *fmt, ...) f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = INT_MAX; va_start(ap, fmt); - ret = vfprintf(&f, fmt, ap); + ret = __vfprintf(&f, fmt, ap); va_end(ap); *f._p = '\0'; return (ret); |