diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/vasprintf.c | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1aedde3..676f3aa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-11-17 Marcus Brinkmann <[email protected]> + * vasprintf.c (int_vasprintf) [HAVE_W32CE_SYSTEM && _MSC_VER]: + Just use a fixed size buffer, as va_copy is not easy to fake. + * gpgcedev.c (struct pipeimpl_s): Add member monitor_rvid. (struct monitor_s, monitor_t): New types. (monitor_table, monitor_table_size): New static variables. diff --git a/src/vasprintf.c b/src/vasprintf.c index b46cdf7..e55408a 100644 --- a/src/vasprintf.c +++ b/src/vasprintf.c @@ -51,6 +51,19 @@ int_vasprintf (result, format, args) const char *format; va_list *args; { +#if defined(HAVE_W32CE_SYSTEM) && defined(_MSC_VER) + /* 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 } |