From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 27 Mar 2002 01:51:14 +0000 (+0100)
Subject: make asprintf work on broken solaris systems ...
X-Git-Tag: v1.0~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e563d0bb7f4feab5dd7d79728da23917a1745a05;p=thirdparty%2Fccache.git

make asprintf work on broken solaris systems ...
---

diff --git a/util.c b/util.c
index 461e93be6..883d910f1 100644
--- a/util.c
+++ b/util.c
@@ -78,19 +78,23 @@ int create_dir(const char *dir)
 
 /*
   this is like asprintf() but dies if the malloc fails
+  note the rather strange use of vsnprintf() to try to make this
+  work on non C99 systems like Solaris
 */
 int x_asprintf(char **ptr, const char *format, ...)
 {
 	va_list ap;
 	int ret;
-	
+	char tmp[2];
+
 	*ptr = NULL;
 	va_start(ap, format);
-	ret = vsnprintf(NULL, 0, format, ap);
+	ret = vsnprintf(tmp, 1, format, ap);
 	va_end(ap);
 
-	if (ret <= 0) {
-		fatal("Bad vsnprintf implementation!?\n");
+	if (ret <= 1) {
+		cc_log("Bad vsnprintf implementation (%d)!?\n", ret);
+		exit(1);
 	}
 
 	*ptr = (char *)malloc(ret+1);