X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Futils.h;h=be94c24d6ddd499fbd452bd83c19f34e197a0e76;hb=3a42b6b1d0b8f9e8ce5c77e838e2573bbfabe593;hp=3c9800c6ec5b154dce6a43c8e2484e153bb9299a;hpb=90f6e953d2d2f905675aadbaf5e307e24c586edd;p=ashd.git

diff --git a/lib/utils.h b/lib/utils.h
index 3c9800c..be94c24 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -2,6 +2,10 @@
 #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))
 
 #define smalloc(size) ({void *__result__; ((__result__ = malloc(size)) == NULL)?({exit(-1); (void *)0;}):__result__;})
 #define srealloc(ptr, size) ({void *__result__; ((__result__ = realloc((ptr), (size))) == NULL)?({exit(-1); (void *)0;}):__result__;})
@@ -10,7 +14,7 @@
 #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 bufadd(buf, new) \
 do { \
@@ -61,5 +65,12 @@ char *decstr(char **p, size_t *len);
 char *vsprintf2(char *format, va_list al);
 char *sprintf2(char *format, ...);
 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);
 
 #endif