From a8dfd90a18017f08c95e3b25b00c0c4f5111c49d Mon Sep 17 00:00:00 2001
From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Mon, 9 Oct 2006 10:21:56 +0200
Subject: [PATCH] thread-safe stk_printf

---
 lib/stkstring.c | 20 ++++++--------------
 lib/stkstring.h |  4 +---
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/lib/stkstring.c b/lib/stkstring.c
index eaeacf00..c3b77301 100644
--- a/lib/stkstring.c
+++ b/lib/stkstring.c
@@ -27,34 +27,26 @@ stk_array_join(char *x, char **s, uns cnt, uns sep)
   *x = 0;
 }
 
-char *stk_printf_buf;
-static int stk_printf_len;
-
 uns
 stk_printf_internal(char *fmt, ...)
 {
+  uns len = 256;
+  char *buf = alloca(len);
   va_list args, args2;
   va_start(args, fmt);
-  if (!stk_printf_buf)
-    {
-      stk_printf_buf = xmalloc(256);
-      stk_printf_len = 256;
-    }
   for (;;)
     {
       va_copy(args2, args);
-      int l = vsnprintf(stk_printf_buf, stk_printf_len, fmt, args2);
+      int l = vsnprintf(buf, len, fmt, args2);
       va_end(args2);
       if (l < 0)
-	stk_printf_len *= 2;
-      else if (l < stk_printf_len)
+	len *= 2;
+      else
 	{
 	  va_end(args);
 	  return l+1;
 	}
-      else
-	stk_printf_len = MAX(stk_printf_len*2, l+1);
-      stk_printf_buf = xrealloc(stk_printf_buf, stk_printf_len);
+      buf = alloca(len);
     }
 }
 
diff --git a/lib/stkstring.h b/lib/stkstring.h
index 1ed25689..f72d3c59 100644
--- a/lib/stkstring.h
+++ b/lib/stkstring.h
@@ -17,7 +17,7 @@
 #define stk_strmulticat(s...) ({ char *_s[]={s}; char *_x=alloca(stk_array_len(_s, ARRAY_SIZE(_s)-1)); stk_array_join(_x, _s, ARRAY_SIZE(_s)-1, 0); _x; })
 #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); memcpy(_x, stk_printf_buf, _l); _x; })
+#define stk_printf(f...) ({ uns _l=stk_printf_internal(f); char *_x=alloca(_l); sprintf(_x, f); _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; })
 
@@ -25,5 +25,3 @@ 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);
 void stk_hexdump_internal(char *dst, byte *src, uns n);
-
-extern char *stk_printf_buf;
-- 
2.39.2