Changeset 4483:d144bef3ecce

Timestamp:

2005-12-15 10:36:24 (3 years ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Add mutt_buffer_printf function, with autoconf test for va_copy.

Files:

• configure.in (modified) (1 diff)
• m4/funcs.m4 (added)
• muttlib.c (modified) (1 diff)
• protos.h (modified) (1 diff)

configure.in

@@ -345 +345 @@
         AC_LIBOBJ(snprintf)
 fi
+
+XIPH_FUNC_VA_COPY
 
 dnl SCO uses chsize() instead of ftruncate()

muttlib.c

@@ -1420 +1420 @@
 }
 
+int mutt_buffer_printf (BUFFER* buf, const char* fmt, ...)
+{
+  va_list ap, ap_retry;
+  int len, blen, doff;
+  
+  va_start (ap, fmt);
+  va_copy (ap_retry, ap);
+
+  doff = buf->dptr - buf->data;
+  blen = buf->dsize - doff;
+  if ((len = vsnprintf (buf->dptr, blen, fmt, ap)) >= blen)
+  {
+    blen = ++len - blen;
+    if (blen < 128)
+      blen = 128;
+    buf->dsize += blen;
+    safe_realloc (&buf->data, buf->dsize);
+    buf->dptr = buf->data + doff;
+    len = vsnprintf (buf->dptr, len, fmt, ap_retry);
+    va_end (ap_retry);
+  }
+  buf->dptr += len;
+
+  va_end (ap);
+  
+  return len;
+}
+
 void mutt_buffer_addstr (BUFFER* buf, const char* s)
 {

protos.h

@@ -40 +40 @@
 BUFFER * mutt_buffer_from (BUFFER *, char *);
 void mutt_buffer_free(BUFFER **);
+int mutt_buffer_printf (BUFFER*, const char*, ...);
 void mutt_buffer_add (BUFFER*, const char*, size_t);
 void mutt_buffer_addstr (BUFFER*, const char*);