Add implementations of asprintf(3) and vasprintf(3).

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@721 d4fa192b-c00b-0410-8231-f00ffab90ce4

configure.ac

@@ -61,6 +61,8 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([strerror])
 AC_FUNC_STRERROR_R
 AC_CHECK_FUNCS([socket])
+AC_CHECK_FUNCS([vasprintf])
+AC_CHECK_FUNCS([asprintf])
 AC_CHECK_FUNCS([strlcat])
 AC_CHECK_FUNCS([strlcpy])
 

include/compat.h

@@ -5,6 +5,14 @@
 #ifndef COMPAT_H_INCLUDED
 #define COMPAT_H_INCLUDED
 
+#ifndef HAVE_VASPRINTF
+int asprintf(char **strp, const char *fmt, va_list ap)
+#endif
+
+#ifndef HAVE_ASPRINTF
+int asprintf(char **strp, const char *fmt, ...)
+#endif
+
 #ifndef HAVE_STRLCPY
 size_t strlcpy(char *dst, const char *src, size_t size);
 #endif

lib/libcompat/Makefile.am

@@ -5,6 +5,8 @@ INCLUDES = -I$(top_srcdir)/include
 lib_LIBRARIES = libcompat.a
 
 libcompat_a_SOURCES = \
+	asprintf.c \
+	vasprintf.c \
 	strlcat.c \
 	strlcpy.c
 

lib/libcompat/asprintf.c

+/*
+ * $Id$
+ *
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "compat.h"
+
+#ifndef HAVE_ASPRINTF
+int
+asprintf(char **strp, const char *fmt, ...)
+{
+	va_list ap;
+	int ret;
+
+	va_start(ap, fmt);
+	ret = vasprintf(strp, fmt, ap);
+	va_end(ap);
+	return (ret);
+}
+#endif

lib/libcompat/strlcat.c

@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include "config.h"
 #include "compat.h"
 
 #ifndef HAVE_STRLCAT

lib/libcompat/strlcpy.c

@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include "config.h"
 #include "compat.h"
 
 #ifndef HAVE_STRLCPY

lib/libcompat/vasprintf.c

+/*
+ * $Id$
+ *
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "compat.h"
+
+#ifndef HAVE_VASPRINTF
+int
+asprintf(char **strp, const char *fmt, va_list ap)
+{
+	va_list ap, aq;
+	int ret;
+
+	va_copy(aq, ap);
+	ret = vsnprintf(NULL, 0, fmt, aq);
+	va_end(aq);
+	if ((*strp = malloc(ret + 1)) == NULL)
+		return (-1);
+	ret = vsnprintf(*strp, ret + 1, fmt, ap);
+	return (ret);
+}
+#endif