#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <assert.h>
#include "obstack.h"
#ifdef _WIN32
#define vsnprintf _vsnprintf
#endif
-int obstack_printf(struct obstack *obst, const char *fmt, ...)
+int obstack_vprintf(struct obstack *obst, const char *fmt, va_list ap)
{
- char buf[128];
- char *buffer = buf;
- va_list ap;
- int len;
+ char buf[128];
+ char *buffer = buf;
+ size_t size = sizeof(buf);
+ int len;
- va_start(ap, fmt);
- len = vsnprintf(buffer, sizeof(buffer), fmt, ap);
- va_end(ap);
- if (len < 0 || len >= (int) sizeof(buffer)) {
- size_t size = len >= 0 ? (size_t) len : sizeof(buffer) * 2;
- char *buffer = malloc(size);
- do {
- if (buffer == NULL)
- return -1;
+ for (;;) {
+ va_list tap;
+ va_copy(tap, ap);
+ len = vsnprintf(buffer, size, fmt, tap);
- va_start(ap, fmt);
- len = vsnprintf(buffer, size, fmt, ap);
- va_end(ap);
-
- /* snprintf should return -1 only in the error case, but older
- * glibcs and probably other systems are buggy in this respect and
- * return -1 if the buffer was too small. We only abort for LARGE
- * unrealistic buffer sizes here */
- if (len < 0) {
- if (size > 65536)
- return -1;
- size *= 2;
- buffer = realloc(buffer, size);
- } else if (len >= (int) size) {
- /* this should not happen if snprintf works correctly */
- abort();
- }
- } while (len < 0);
- free(buffer);
+ /* snprintf should return -1 only in the error case, but older glibcs
+ * and probably other systems are buggy in this respect and return -1 if
+ * the buffer was too small. We only abort for LARGE unrealistic buffer
+ * sizes here */
+ if (len < 0) {
+ if (buffer != buf)
+ free(buffer);
+ if (size > 65536)
+ return -1;
+ size *= 2;
+ } else if ((size_t)len >= size) {
+ /* If we come here more than once, vsnprintf() returned garbage */
+ assert(buffer == buf);
+ size = (size_t)len + 1;
+ } else {
+ break;
+ }
+ buffer = malloc(size);
}
+
obstack_grow(obst, buffer, len);
+ if (buffer != buf)
+ free(buffer);
return len;
}
+
+int obstack_printf(struct obstack *obst, const char *fmt, ...)
+{
+ va_list ap;
+ int res;
+
+ va_start(ap, fmt);
+ res = obstack_vprintf(obst, fmt, ap);
+ va_end(ap);
+
+ return res;
+}