harmonize asprintf with OpenSSH

 * use the original name for the file from OpenSSH (remove duplicate version)
 * add va_copy/__va_copy checks to configure
 * incorporate proposed fixes to openssh version:
   + include more system headers directly for various definitions
   + limit the scope of va_copy/va_end to their affected vsnprintf calls
   + simplify error handling, removing a dead assignment

1 files changed, 25 insertions, 0 deletions

diff --git a/configure.ac.tpl b/configure.ac.tpl
index de3995c..b557687 100644
--- a/configure.ac.tpl
+++ b/configure.ac.tpl
@@ -117,6 +117,31 @@ AC_CHECK_FUNC(explicit_bzero,
         AC_DEFINE(NO_EXPLICIT_BZERO)
         AM_CONDITIONAL(NO_EXPLICIT_BZERO, true))
 
+AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <stdarg.h>
+va_list x,y;
+                ]], [[ va_copy(x,y); ]])],
+        [ ac_cv_have_va_copy="yes" ],
+        [ ac_cv_have_va_copy="no"
+        ])
+])
+if test "x$ac_cv_have_va_copy" = "xyes" ; then
+        AC_DEFINE([HAVE_VA_COPY], [1], [Define if va_copy exists])
+fi
+
+AC_CACHE_CHECK([whether __va_copy exists], ac_cv_have___va_copy, [
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <stdarg.h>
+va_list x,y;
+                ]], [[ __va_copy(x,y); ]])],
+        [ ac_cv_have___va_copy="yes" ], [ ac_cv_have___va_copy="no"
+        ])
+])
+if test "x$ac_cv_have___va_copy" = "xyes" ; then
+        AC_DEFINE([HAVE___VA_COPY], [1], [Define if __va_copy exists])
+fi
+
 AC_CHECK_FUNC(getauxval, AC_DEFINE(HAVE_GETAUXVAL))
 
 AC_CHECK_FUNC(funopen, AC_DEFINE(HAVE_FUNOPEN))