X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstkstring.c;h=19c3a5dd8c2e0352cb864abd9886071fc605b1f4;hb=580fd9c443c2a4faba5a703d49f366de5d3968c9;hp=316237476585510c8b549d1a4bdb0c5f9f12cbc3;hpb=ae43769789cf11c7b13fdc648bcec5f91d8b6e3e;p=libucw.git

diff --git a/lib/stkstring.c b/lib/stkstring.c
index 31623747..19c3a5dd 100644
--- a/lib/stkstring.c
+++ b/lib/stkstring.c
@@ -13,7 +13,7 @@ stk_array_len(char **s, uns cnt)
 }
 
 void
-stk_array_copy(char *x, char **s, uns cnt)
+stk_array_join(char *x, char **s, uns cnt, uns sep)
 {
   while (cnt--)
     {
@@ -21,46 +21,83 @@ stk_array_copy(char *x, char **s, uns cnt)
       memcpy(x, *s, l);
       x += l;
       s++;
+      if (sep && cnt)
+	*x++ = sep;
     }
   *x = 0;
 }
 
-char *stk_printf_buf;
-static int stk_printf_len;
-
 uns
-stk_printf_internal(char *fmt, ...)
+stk_printf_internal(const char *fmt, ...)
 {
-  va_list args;
+  uns len = 256;
+  char *buf = alloca(len);
+  va_list args, args2;
   va_start(args, fmt);
-  if (!stk_printf_buf)
+  for (;;)
     {
-      stk_printf_buf = xmalloc(256);
-      stk_printf_len = 256;
+      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);
     }
+}
+
+uns
+stk_vprintf_internal(const char *fmt, va_list args)
+{
+  uns len = 256;
+  char *buf = alloca(len);
+  va_list args2;
   for (;;)
     {
-      int l = vsnprintf(stk_printf_buf, stk_printf_len, fmt, args);
+      va_copy(args2, args);
+      int l = vsnprintf(buf, len, fmt, args2);
+      va_end(args2);
       if (l < 0)
-	stk_printf_len *= 2;
-      else if (l < stk_printf_len)
-	return l+1;
+	len *= 2;
       else
-	stk_printf_len = MAX(stk_printf_len*2, l+1);
+	{
+	  va_end(args);
+	  return l+1;
+	}
+      buf = alloca(len);
+    }
+}
+
+void
+stk_hexdump_internal(char *dst, const byte *src, uns n)
+{
+  for (uns i=0; i<n; i++)
+    {
+      if (i)
+	*dst++ = ' ';
+      dst += sprintf(dst, "%02x", *src++);
     }
+  *dst = 0;
 }
 
 #ifdef TEST
 
 int main(void)
 {
-  char *a = stk_strdup("are");
+  char *a = stk_strndup("are!",3);
   a = stk_strcat(a, " the ");
-  a = stk_strmulticat(a, "Jabberwock, ", "my", NULL);
+  a = stk_strmulticat(a, stk_strdup("Jabberwock, "), "my", NULL);
   char *arr[] = { a, " son" };
   a = stk_strarraycat(arr, 2);
   a = stk_printf("Bew%s!", a);
   puts(a);
+  puts(stk_hexdump(a, 3));
+  char *ary[] = { "The", "jaws", "that", "bite" };
+  puts(stk_strjoin(ary, 4, ' '));
   return 0;
 }