Don't use vasprintf() anymore on Windows.

Windows doesn't actually support it, but MinGW provides it. However, with some versions of
MinGW it doesn't work correctly. Instead, we vsnprintf() to a local buffer and xstrdup() the
results.

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index e4079ce4cafe93c0296e4a05bce43d1cb9851be0..58f2bcee3e950e0958d240afe8501de876d64e6d 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -147,10 +147,18 @@ int xasprintf(char **strp, const char *fmt, ...) {
 }
 
 int xvasprintf(char **strp, const char *fmt, va_list ap) {
+#ifdef HAVE_MINGW
+       char buf[1024];
+       int result = vsnprintf(buf, sizeof buf, fmt, ap);
+       if(result < 0)
+               exit(xalloc_exit_failure);
+       *strp = xstrdup(buf);
+#else
        int result = vasprintf(strp, fmt, ap);
        if(result < 0) {
                fprintf(stderr, "vasprintf() failed: %s\n", strerror(errno));
                exit(xalloc_exit_failure);
        }
+#endif
        return result;
 }