summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2002-10-29 01:47:39 +0000
committerManuel Novoa III <mjn3@codepoet.org>2002-10-29 01:47:39 +0000
commit6a3510f62cbcf0db3f4ab99f2ed9c433d52d7149 (patch)
tree12bb810e17be5126d4a6dd2ba7b6bea8c4feb451
parentb7df7e6da8876ee40e61d457e2e37523e380aad7 (diff)
Fix a problem in vasprintf (reported by vodz a while back) when built
without custom stream support. In that case, it is necessary to do a va_copy. Note: The affected code is not built in the stock config. Also, make sure each va_copy has a matching va_end, as required by C99.
-rw-r--r--libc/stdio/printf.c49
1 files changed, 35 insertions, 14 deletions
diff --git a/libc/stdio/printf.c b/libc/stdio/printf.c
index e4eb0b69d..204361825 100644
--- a/libc/stdio/printf.c
+++ b/libc/stdio/printf.c
@@ -44,6 +44,12 @@
* 8-16-2002
* Fix two problems that showed up with the python 2.2.1 tests; one
* involving %o and one involving %f.
+ *
+ * 10-28-2002
+ * Fix a problem in vasprintf (reported by vodz a while back) when built
+ * without custom stream support. In that case, it is necessary to do
+ * a va_copy.
+ * Make sure each va_copy has a matching va_end, as required by C99.
*/
@@ -109,6 +115,26 @@
#endif
/**********************************************************************/
+/* Deal with pre-C99 compilers. */
+
+#ifndef va_copy
+
+#ifdef __va_copy
+#define va_copy(A,B) __va_copy(A,B)
+#else
+ /* TODO -- maybe create a bits/vacopy.h for arch specific versions
+ * to ensure we get the right behavior? Either that or fall back
+ * on the portable (but costly in size) method of using a va_list *.
+ * That means a pointer derefs in the va_arg() invocations... */
+#warning neither va_copy or __va_copy is defined. using a simple copy instead...
+ /* the glibc manual suggests that this will usually suffice when
+ __va_copy doesn't exist. */
+#define va_copy(A,B) A = B
+#endif
+
+#endif /* va_copy */
+
+/**********************************************************************/
#define __PA_FLAG_INTMASK \
(__PA_FLAG_CHAR|PA_FLAG_SHORT|__PA_FLAG_INT|PA_FLAG_LONG|PA_FLAG_LONG_LONG)
@@ -410,7 +436,7 @@ int vfprintf(FILE * __restrict stream, register const char * __restrict format,
_outnstr(stream, format, strlen(format));
count = -1;
} else {
- _ppfs_prepargs(&ppfs, arg);
+ _ppfs_prepargs(&ppfs, arg); /* This did a va_copy!!! */
do {
while (*format && (*format != '%')) {
@@ -443,6 +469,8 @@ int vfprintf(FILE * __restrict stream, register const char * __restrict format,
++format;
}
} while (1);
+
+ va_end(ppfs->arg); /* Need to clean up after va_copy! */
}
__STDIO_THREADUNLOCK(stream);
@@ -523,18 +551,7 @@ void _ppfs_prepargs(register ppfs_t *ppfs, va_list arg)
{
int i;
-#ifdef __va_copy
- __va_copy(ppfs->arg, arg);
-#else
- /* TODO -- maybe create a bits/vacopy.h for arch specific versions
- * to ensure we get the right behavior? Either that or fall back
- * on the portable (but costly in size) method of using a va_list *.
- * That means a pointer derefs in the va_arg() invocations... */
-#warning __va_copy is not defined, using a simple copy instead...
- /* the glibc manual suggests that this will usually suffice when
- __va_copy doesn't exist. */
- ppfs->arg = arg;
-#endif
+ va_copy(ppfs->arg, arg);
if ((i = ppfs->maxposarg) > 0) { /* init for positional args */
ppfs->num_data_args = i;
@@ -1472,8 +1489,12 @@ int vasprintf(char **__restrict buf, const char * __restrict format,
* only does one malloc. This can be a problem though when custom printf
* specs or the %m specifier are involved because the results of the
* second call might be different from the first. */
+ va_list arg2;
+ int rv;
- int rv = vsnprintf(NULL, 0, format, arg);
+ va_copy(arg2, arg);
+ rv = vsnprintf(NULL, 0, format, arg2);
+ va_end(arg2);
return (((rv >= 0) && ((*buf = malloc(++rv)) != NULL))
? vsnprintf(*buf, rv, format, arg)