#include "output_buffer.h"
#include "../log.h"
+#include "../minmax.h"
#define BUF_INC 1024
size_t buf_output_add(struct buf_output *out, const char *buf, size_t len)
{
- while (out->max_buflen - out->buflen < len) {
+ if (out->max_buflen - out->buflen < len) {
+ size_t need = len - (out->max_buflen - out->buflen);
size_t old_max = out->max_buflen;
- out->max_buflen += BUF_INC;
+ need = max((size_t) BUF_INC, need);
+ out->max_buflen += need;
out->buf = realloc(out->buf, out->max_buflen);
- memset(&out->buf[old_max], 0, BUF_INC);
+
+ old_max = max(old_max, out->buflen + len);
+ if (old_max + need > out->max_buflen)
+ need = out->max_buflen - old_max;
+ memset(&out->buf[old_max], 0, need);
}
memcpy(&out->buf[out->buflen], buf, len);