2010-11-17 Marcus Brinkmann <mb@g10code.com>

        * vasprintf.c (int_vasprintf) [HAVE_W32CE_SYSTEM]: Just use a
        fixed size buffer, as va_copy is not easy to fake.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a547bea69bdffb7a48d5eeb4f4c001d0aaa3dc5..2215329a5712ddc841f87498493b0a827aafa110 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-17  Marcus Brinkmann  <mb@g10code.com>
+
+       * vasprintf.c (int_vasprintf) [HAVE_W32CE_SYSTEM]: Just use a
+       fixed size buffer, as va_copy is not easy to fake.
+
 2010-11-15  Marcus Brinkmann  <mb@g10code.com>
 
        * w32-ce.h (strcasecmp, strdup) [_MSC_VER]: Define.

diff --git a/src/vasprintf.c b/src/vasprintf.c
index 77113a310e727eee8b8aa980b36c4bc6e68180c6..03d38ff22867cc7a740de0e62da18505e87dfb98 100644 (file)
--- a/src/vasprintf.c
+++ b/src/vasprintf.c
@@ -51,6 +51,19 @@ int_vasprintf (result, format, args)
      const char *format;
      va_list *args;
 {
+#ifdef HAVE_W32CE_SYSTEM
+  /* No va_copy and the replacement above doesn't work.  */
+#define MAX_STRLEN 256
+  *result = malloc (MAX_STRLEN);
+  if (*result != NULL)
+    {
+      int res = _vsnprintf (*result, MAX_STRLEN, format, *args);
+      (*result)[MAX_STRLEN - 1] = '\0';
+      return res;
+    }
+  else
+    return 0;
+#else
   const char *p = format;
   /* Add one to make sure that it is never zero, which might cause malloc
      to return NULL.  */
@@ -133,6 +146,7 @@ int_vasprintf (result, format, args)
     return vsprintf (*result, format, *args);
   else
     return 0;
+#endif
 }
 
 int