From d49347a0fe4cdf22bb584bfef943a1290109f413 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Fri, 28 Apr 2006 10:56:36 +0200 Subject: [PATCH] Added stk_strjoin() as well. --- lib/stkstring.c | 6 +++++- lib/stkstring.h | 7 ++++--- lib/stkstring.t | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/stkstring.c b/lib/stkstring.c index ccc689da..eaeacf00 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,6 +21,8 @@ stk_array_copy(char *x, char **s, uns cnt) memcpy(x, *s, l); x += l; s++; + if (sep && cnt) + *x++ = sep; } *x = 0; } @@ -80,6 +82,8 @@ int main(void) 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; } diff --git a/lib/stkstring.h b/lib/stkstring.h index 22808cc7..1ed25689 100644 --- a/lib/stkstring.h +++ b/lib/stkstring.h @@ -14,14 +14,15 @@ #define stk_strdup(s) ({ char *_s=(s); uns _l=strlen(_s)+1; char *_x=alloca(_l); memcpy(_x, _s, _l); _x; }) #define stk_strndup(s,n) ({ char *_s=(s); uns _l=strnlen(_s,(n)); char *_x=alloca(_l+1); memcpy(_x, _s, _l); _x[_l]=0; _x; }) #define stk_strcat(s1,s2) ({ char *_s1=(s1); char *_s2=(s2); uns _l1=strlen(_s1); uns _l2=strlen(_s2); char *_x=alloca(_l1+_l2+1); memcpy(_x,_s1,_l1); memcpy(_x+_l1,_s2,_l2+1); _x; }) -#define stk_strmulticat(s...) ({ char *_s[]={s}; char *_x=alloca(stk_array_len(_s, ARRAY_SIZE(_s)-1)); stk_array_copy(_x, _s, ARRAY_SIZE(_s)-1); _x; }) -#define stk_strarraycat(s,n) ({ char **_s=(s); int _n=(n); char *_x=alloca(stk_array_len(_s,_n)); stk_array_copy(_x, _s, _n); _x; }) +#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_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_copy(char *x, 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); diff --git a/lib/stkstring.t b/lib/stkstring.t index 9b1e7e50..2b0c191c 100644 --- a/lib/stkstring.t +++ b/lib/stkstring.t @@ -3,3 +3,4 @@ Run: obj/lib/stkstring-t Out: Beware the Jabberwock, my son! 42 65 77 + The jaws that bite -- 2.39.2