Display and control your Android device
Add (v)asprintf compatibility functions
Romain Vimontd5f6697f3a59
diff --git a/app/meson.build b/app/meson.buildindex 32adf18b..1561fdcd 100644--- a/app/meson.build+++ b/app/meson.build@@ -138,6 +138,8 @@ endifcheck_functions = ['strdup',+ 'asprintf',+ 'vasprintf',]foreach f : check_functionsdiff --git a/app/src/compat.c b/app/src/compat.cindex 4d084517..11ddd3cb 100644--- a/app/src/compat.c+++ b/app/src/compat.c@@ -2,7 +2,10 @@#include "config.h"+#include <assert.h>#include <stdlib.h>+#include <stdio.h>+#include <stdarg.h>#include <string.h>#ifndef HAVE_STRDUP@@ -15,3 +18,36 @@ char *strdup(const char *s) {return dup;}#endif++#ifndef HAVE_ASPRINTF+int asprintf(char **strp, const char *fmt, ...) {+ va_list va;+ va_start(va, fmt);+ int ret = vasprintf(strp, fmt, va);+ va_end(va);+ return ret;+}+#endif++#ifndef HAVE_VASPRINTF+int vasprintf(char **strp, const char *fmt, va_list ap) {+ va_list va;+ va_copy(va, ap);+ int len = vsnprintf(NULL, 0, fmt, va);+ va_end(va);++ char *str = malloc(len + 1);+ if (!str) {+ return -1;+ }++ va_copy(va, ap);+ int len2 = vsnprintf(str, len + 1, fmt, va);+ (void) len2;+ assert(len == len2);+ va_end(va);++ *strp = str;+ return len;+}+#endifdiff --git a/app/src/compat.h b/app/src/compat.hindex c06c23fa..3ab56049 100644--- a/app/src/compat.h+++ b/app/src/compat.h@@ -58,4 +58,12 @@char *strdup(const char *s);#endif+#ifndef HAVE_ASPRINTF+int asprintf(char **strp, const char *fmt, ...);+#endif++#ifndef HAVE_VASPRINTF+int vasprintf(char **strp, const char *fmt, va_list ap);+#endif+#endif