- if (newsize >= buf->size) {
- /* rounds newsize to the 1024 multiple just after newsize+1 */
- newsize = (newsize + BUFSIZ_INCREMENT) & ~(BUFSIZ_INCREMENT - 1);
- p_realloc(&buf->data, newsize);
+ p_allocgrow(&buf->data, newsize + 1, &buf->size);
+}
+
+ssize_t buffer_addvf(buffer_t *buf, const char *fmt, va_list ap)
+{
+ ssize_t len, avail = buf->size - buf->len;
+ va_list ap2;
+
+ va_copy(ap2, ap);
+
+ len = vsnprintf(buf->data + buf->len, avail, fmt, ap);
+ if (len >= avail) {
+ buffer_resize(buf, buf->len + len);
+ avail = buf->size - buf->len;
+ len = vsnprintf(buf->data + buf->len, avail, fmt, ap2);