aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-03-09 22:21:20 +0000
committerGravatar Rob Landley <rob@landley.net>2006-03-09 22:21:20 +0000
commit1f305dc0fdb8415c9c1321e49cc194089e58c456 (patch)
treea176d02a50d900a5dc610266d920c5efc65c3e1e /libbb
parent3a324754f88b913091eca8970c686f2e998028a9 (diff)
downloadbusybox-1f305dc0fdb8415c9c1321e49cc194089e58c456.tar.gz
busybox-1f305dc0fdb8415c9c1321e49cc194089e58c456.tar.bz2
Portability patch from rfelker. The bb_asprintf.c thing needs an eventual
follow up in platform.h to set the #ifdef, but the workaround works for everybody, so...
Diffstat (limited to 'libbb')
-rw-r--r--libbb/bb_asprintf.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libbb/bb_asprintf.c b/libbb/bb_asprintf.c
index 8658a5408..191417a2d 100644
--- a/libbb/bb_asprintf.c
+++ b/libbb/bb_asprintf.c
@@ -13,9 +13,19 @@ char *bb_xasprintf(const char *format, ...)
int r;
char *string_ptr;
+#ifdef HAVE_GNU_EXTENSIONS
va_start(p, format);
r = vasprintf(&string_ptr, format, p);
va_end(p);
+#else
+ va_start(p, format);
+ r = vsnprintf(NULL, 0, format, p);
+ va_end(p);
+ string_ptr = xmalloc(r+1);
+ va_start(p, format);
+ r = vsnprintf(string_ptr, r+1, format, p);
+ va_end(p);
+#endif
if (r < 0) {
bb_perror_msg_and_die("bb_xasprintf");