X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Futils.h;h=206691876c67270432660bf00abcc4de20ea78a2;hb=9d6b46568635a6cbf151790e5fd760d2a86049a2;hp=2b9d1dfac0e39f0b94a82856c344351f0e1e09a8;hpb=f2b26d44416abd494ce430659cfbbf254d9c3c55;p=ashd.git

diff --git a/lib/utils.h b/lib/utils.h
index 2b9d1df..2066918 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -2,6 +2,7 @@
 #define _UTILS_H
 
 #include <stdarg.h>
+#include <sys/types.h>
 
 #define max(a, b) (((b) > (a))?(b):(a))
 #define min(a, b) (((b) < (a))?(b):(a))
@@ -13,8 +14,9 @@
 #define omalloc(o) ((o) = szmalloc(sizeof(*(o))))
 
 #define bufinit(buf) memset(&(buf), 0, sizeof(buf))
-#define buffree(buf) do { if((buf).b != NULL) {free((buf).b);} } while(0)
+#define buffree(buf) do { if((buf).b != NULL) {free((buf).b);} bufinit(buf); } while(0)
 #define sizebuf(buf, wanted) (_sizebuf((struct buffer *)&(buf), (wanted), sizeof(*((buf).b))))
+#define bufdel(buf, i) (memmove((buf).b + (i), (buf).b + (i) + 1, (--((buf).d) - (i)) * sizeof(*((buf).b))))
 #define bufadd(buf, new) \
 do { \
     _sizebuf((struct buffer *)&(buf), (buf).d + 1, sizeof(*((buf).b))); \
@@ -59,6 +61,12 @@ struct charvbuf {
     size_t s, d;
 };
 
+struct btree {
+    struct btree *l, *r;
+    int h;
+    void *d;
+};
+
 void _sizebuf(struct buffer *buf, size_t wanted, size_t el);
 char *decstr(char **p, size_t *len);
 char *vsprintf2(char *format, va_list al);
@@ -67,5 +75,15 @@ char *sprintf3(char *format, ...);
 off_t atoo(char *n);
 char **tokenize(char *src);
 void freeca(char **ca);
+int calen(char **a);
+void bvprintf(struct charbuf *buf, char *format, va_list al);
+void bprintf(struct charbuf *buf, char *format, ...);
+void replstr(char **p, char *n);
+char *base64encode(char *data, size_t datalen);
+char *base64decode(char *data, size_t *datalen);
+int bbtreedel(struct btree **tree, void *item, int (*cmp)(void *, void *));
+void freebtree(struct btree **tree, void (*ffunc)(void *));
+int bbtreeput(struct btree **tree, void *item, int (*cmp)(void *, void *));
+void *btreeget(struct btree *tree, void *key, int (*cmp)(void *, void *));
 
 #endif