* Bug fixes: Fix numerous char array size mismatches, signed/unsigned

[citadel.git] / citadel / tools.h

diff --git a/citadel/tools.h b/citadel/tools.h
index 0ea1e16198197473f099995f73145ddaad39be64..1c6320a73e679db3aa61632c82f433ae4d98d87c 100644 (file)
--- a/citadel/tools.h
+++ b/citadel/tools.h
@@ -1,21 +1,22 @@
 /* $Id$ */
 char *safestrncpy(char *dest, const char *src, size_t n);
-int num_tokens (char *source, char tok);
-void extract_token(char *dest, char *source, int parmnum, char separator);
-int extract_int (char *source, int parmnum);
-long int extract_long (char *source, long int parmnum);
-void encode_base64(char *dest, char *source);
-void decode_base64(char *dest, char *source);
+int num_tokens (const char *source, char tok);
+void extract_token(char *dest, const char *source, unsigned long parmnum, char separator);
+int extract_int (const char *source, unsigned long parmnum);
+long extract_long (const char *source, unsigned long parmnum);
+unsigned long extract_unsigned_long(const char *source, unsigned long parmnum);
+void CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen);
+int CtdlDecodeBase64(char *dest, const char *source, size_t length);
 void striplt(char *);
-int haschar(char *st, int ch);
+int haschar(const char *st, int ch);
 int collapsed_strcmp(char *s1, char *s2);
-void remove_token(char *source, int parmnum, char separator);
-void fmt_date(char *buf, time_t thetime);
+void remove_token(char *source, unsigned long parmnum, char separator);
+void fmt_date(char *buf, size_t n, time_t thetime, int seconds);
 int is_msg_in_mset(char *mset, long msgnum);
 char *memreadline(char *start, char *buf, int maxlen);
 
 #ifndef HAVE_STRNCASECMP
-int strncasecmp(char *, char *, int)
+int strncasecmp(char *, char *, int);
 #endif
 #ifndef HAVE_STRCASECMP
 #define strcasecmp(x,y) strncasecmp(x,y,INT_MAX);
@@ -23,3 +24,10 @@ int strncasecmp(char *, char *, int)
 
 #define extract(dest,source,parmnum)   extract_token(dest,source,parmnum,'|')
 #define num_parms(source)              num_tokens(source, '|')
+void stripout(char *str, char leftboundary, char rightboundary);
+void stripallbut(char *str, char leftboundary, char rightboundary);
+
+char *myfgets(char *s, int size, FILE *stream);
+void urlesc(char *outbuf, char *strbuf);
+char *CtdlTempFileName(char *prefix1, int prefix2);
+FILE *CtdlTempFile(void);