From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Tue, 10 Apr 2007 13:37:49 +0000 (+0200)
Subject: added stk_vprintf
X-Git-Tag: holmes-import~506^2~91^2~1
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=7069022e1bb5c16175835e022798b3b5b42c5fe7;p=libucw.git

added stk_vprintf
---

diff --git a/lib/stkstring.c b/lib/stkstring.c
index c3b77301..f9ba323d 100644
--- a/lib/stkstring.c
+++ b/lib/stkstring.c
@@ -28,7 +28,7 @@ stk_array_join(char *x, char **s, uns cnt, uns sep)
 }
 
 uns
-stk_printf_internal(char *fmt, ...)
+stk_printf_internal(const char *fmt, ...)
 {
   uns len = 256;
   char *buf = alloca(len);
@@ -50,6 +50,28 @@ stk_printf_internal(char *fmt, ...)
     }
 }
 
+uns
+stk_vprintf_internal(const char *fmt, va_list args)
+{
+  uns len = 256;
+  char *buf = alloca(len);
+  va_list args2;
+  for (;;)
+    {
+      va_copy(args2, args);
+      int l = vsnprintf(buf, len, fmt, args2);
+      va_end(args2);
+      if (l < 0)
+	len *= 2;
+      else
+	{
+	  va_end(args);
+	  return l+1;
+	}
+      buf = alloca(len);
+    }
+}
+
 void
 stk_hexdump_internal(char *dst, byte *src, uns n)
 {
diff --git a/lib/stkstring.h b/lib/stkstring.h
index f72d3c59..74e15288 100644
--- a/lib/stkstring.h
+++ b/lib/stkstring.h
@@ -18,10 +18,12 @@
 #define stk_strarraycat(s,n) ({ char **_s=(s); int _n=(n); char *_x=alloca(stk_array_len(_s,_n)); stk_array_join(_x, _s, _n, 0); _x; })
 #define stk_strjoin(s,n,sep) ({ char **_s=(s); int _n=(n); char *_x=alloca(stk_array_len(_s,_n)+_n-1); stk_array_join(_x, _s, _n, (sep)); _x; })
 #define stk_printf(f...) ({ uns _l=stk_printf_internal(f); char *_x=alloca(_l); sprintf(_x, f); _x; })
+#define stk_vprintf(f, args) ({ uns _l=stk_vprintf_internal(f, args); char *_x=alloca(_l); vsprintf(_x, f, args); _x; })
 #define stk_hexdump(s,n) ({ uns _n=(n); char *_x=alloca(3*_n+1); stk_hexdump_internal(_x,(byte*)(s),_n); _x; })
 #define stk_str_unesc(s) ({ byte *_s=(s); byte *_d=alloca(strlen(_s)+1); str_unesc(_d, _s); _d; })
 
 uns stk_array_len(char **s, uns cnt);
 void stk_array_join(char *x, char **s, uns cnt, uns sep);
-uns stk_printf_internal(char *x, ...) FORMAT_CHECK(printf,1,2);
+uns stk_printf_internal(const char *x, ...) FORMAT_CHECK(printf,1,2);
+uns stk_vprintf_internal(const char *x, va_list args);
 void stk_hexdump_internal(char *dst, byte *src, uns n);