summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdio/sprintf.c
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>1998-01-12 06:14:30 +0000
committermillert <millert@openbsd.org>1998-01-12 06:14:30 +0000
commita4a741f7cfab4f58efbc70e19b70b498c81b0748 (patch)
tree5100f22859b08302417ecb5fd5612e93cf0ae7d6 /lib/libc/stdio/sprintf.c
parentcvs server: nothing known about share/man/man8/rc.conf.8 (diff)
downloadwireguard-openbsd-a4a741f7cfab4f58efbc70e19b70b498c81b0748.tar.xz
wireguard-openbsd-a4a741f7cfab4f58efbc70e19b70b498c81b0748.zip
Based on some FreeBSD changes:
For *s*printf, set f._file to -1 like the comments in stdio.h say. Use '\0', not 0, where appropriate. Don't error out on size of '0' for v?snprintf().
Diffstat (limited to 'lib/libc/stdio/sprintf.c')
-rw-r--r--lib/libc/stdio/sprintf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index 16b99a27f97..994192f04bc 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -35,7 +35,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sprintf.c,v 1.3 1997/07/25 20:30:11 mickey Exp $";
+static char rcsid[] = "$OpenBSD: sprintf.c,v 1.4 1998/01/12 06:14:31 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
@@ -61,6 +61,7 @@ sprintf(str, fmt, va_alist)
va_list ap;
FILE f;
+ f._file = -1;
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *)str;
f._bf._size = f._w = INT_MAX;
@@ -71,6 +72,6 @@ sprintf(str, fmt, va_alist)
#endif
ret = vfprintf(&f, fmt, ap);
va_end(ap);
- *f._p = 0;
+ *f._p = '\0';
return (ret);
}