X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Flibcitadel.h;h=dc921fef3659384bbe38dda9b4b1899751cf1c48;hb=c08adcea52e85d6139ad158c17eb3d1941df2eb5;hp=dbacca2d48a1d351858f7c94385b5f44851613c3;hpb=25c64d8ab245696d969680a6cc35059d605d3e4e;p=citadel.git

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index dbacca2d4..dc921fef3 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -1,8 +1,3 @@
-/*
- * $Id$
- *
- */
-
 
 /* protect against double includes */
 #ifndef LIBCITADEL_H
@@ -15,7 +10,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#define LIBCITADEL_VERSION_NUMBER	770
+#define LIBCITADEL_VERSION_NUMBER	786
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.
@@ -24,7 +19,6 @@
 #define SIZ	4096
 #endif
 
-#define strof(a) #a
 
 /* Logging levels - correspond to syslog(3) */
 enum LogLevel {
@@ -74,7 +68,8 @@ typedef enum __GPEXWhichPolicy {
 	roompolicy,
 	floorpolicy,
 	sitepolicy,
-	mailboxespolicy
+	mailboxespolicy,
+	maxpolicy
 }GPEXWhichPolicy;
 
 /*
@@ -97,6 +92,7 @@ typedef enum __GPEXWhichPolicy {
 #define IsEmptyStr(a) ((a)[0] == '\0')
 #endif
 
+
 /*
  * another word to indicate n/a for a pointer if NULL already has a "meaning"
  */
@@ -117,46 +113,25 @@ void ShutDownLibCitadel(void);
 
 void extract_key(char *target, char *source, long sourcelen, char *key, long keylen, char KeyEnd);
 
+
+typedef void (*MimeParserCallBackType)(char *cbname,
+				       char *cbfilename,
+				       char *cbpartnum,
+				       char *cbdisp,
+				       void *cbcontent,
+				       char *cbtype,
+				       char *cbcharset,
+				       size_t cblength,
+				       char *cbencoding,
+				       char *cbid,
+				       void *cbuserdata);
+
 void mime_parser(char *content_start, char *content_end,
-		void (*CallBack)
-			(char *cbname,
-			char *cbfilename,
-			char *cbpartnum,
-			char *cbdisp,
-			void *cbcontent,
-			char *cbtype,
-			char *cbcharset,
-			size_t cblength,
-			char *cbencoding,
-			char *cbid,
-			void *cbuserdata),
-		void (*PreMultiPartCallBack)
-			(char *cbname,
-			char *cbfilename,
-			char *cbpartnum,
-			char *cbdisp,
-			void *cbcontent,
-			char *cbtype,
-			char *cbcharset,
-			size_t cblength,
-			char *cbencoding,
-			char *cbid,
-			void *cbuserdata),
-		void (*PostMultiPartCallBack)
-			(char *cbname,
-			char *cbfilename,
-			char *cbpartnum,
-			char *cbdisp,
-			void *cbcontent,
-			char *cbtype,
-			char *cbcharset,
-			size_t cblength,
-			char *cbencoding,
-			char *cbid,
-			void *cbuserdata),
-		void *userdata,
-		int dont_decode
-);
+		 MimeParserCallBackType CallBack,
+		 MimeParserCallBackType PreMultiPartCallBack,
+		 MimeParserCallBackType PostMultiPartCallBack,
+		 void *userdata,
+		 int dont_decode);
 
 
 
@@ -167,89 +142,23 @@ void mime_decode(char *partnum,
 		 char *disposition,
 		 char *id,
 		 char *name, char *filename,
-		 void (*CallBack)
-		  (char *cbname,
-		   char *cbfilename,
-		   char *cbpartnum,
-		   char *cbdisp,
-		   void *cbcontent,
-		   char *cbtype,
-		   char *cbcharset,
-		   size_t cblength,
-		   char *cbencoding,
-		   char *cbid,
-		   void *cbuserdata),
-		 void (*PreMultiPartCallBack)
-		  (char *cbname,
-		   char *cbfilename,
-		   char *cbpartnum,
-		   char *cbdisp,
-		   void *cbcontent,
-		   char *cbtype,
-		   char *cbcharset,
-		   size_t cblength,
-		   char *cbencoding,
-		   char *cbid,
-		   void *cbuserdata),
-		 void (*PostMultiPartCallBack)
-		  (char *cbname,
-		   char *cbfilename,
-		   char *cbpartnum,
-		   char *cbdisp,
-		   void *cbcontent,
-		   char *cbtype,
-		   char *cbcharset,
-		   size_t cblength,
-		   char *cbencoding,
-		   char *cbid,
-		   void *cbuserdata),
-		  void *userdata,
-		  int dont_decode
-);
+		 MimeParserCallBackType CallBack,
+		 MimeParserCallBackType PreMultiPartCallBack,
+		 MimeParserCallBackType PostMultiPartCallBack,
+		 void *userdata,
+		 int dont_decode);
 void the_mime_parser(char *partnum,
 		     char *content_start, char *content_end,
-		     void (*CallBack)
-		      (char *cbname,
-		       char *cbfilename,
-		       char *cbpartnum,
-		       char *cbdisp,
-		       void *cbcontent,
-		       char *cbtype,
-		       char *cbcharset,
-		       size_t cblength,
-		       char *cbencoding,
-		       char *cbid,
-		       void *cbuserdata),
-		     void (*PreMultiPartCallBack)
-		      (char *cbname,
-		       char *cbfilename,
-		       char *cbpartnum,
-		       char *cbdisp,
-		       void *cbcontent,
-		       char *cbtype,
-		       char *cbcharset,
-		       size_t cblength,
-		       char *cbencoding,
-		       char *cbid,
-		       void *cbuserdata),
-		     void (*PostMultiPartCallBack)
-		      (char *cbname,
-		       char *cbfilename,
-		       char *cbpartnum,
-		       char *cbdisp,
-		       void *cbcontent,
-		       char *cbtype,
-		       char *cbcharset,
-		       size_t cblength,
-		       char *cbencoding,
-		       char *cbid,
-		       void *cbuserdata),
-		      void *userdata,
-		      int dont_decode
-);
+		     MimeParserCallBackType CallBack,
+		     MimeParserCallBackType PreMultiPartCallBack,
+		     MimeParserCallBackType PostMultiPartCallBack,
+		     void *userdata,
+		     int dont_decode);
 
 typedef struct StrBuf StrBuf;
 
+#define strof(a) #a
+#define CStrOf(a) #a, sizeof(#a) - 1
 typedef struct _ConstStr {
 	const char *Key;
 	long len;
@@ -275,6 +184,7 @@ const char *ChrPtr(const StrBuf *Str);
 int StrLength(const StrBuf *Str);
 #define SKEY(a) ChrPtr(a), StrLength(a)
 long StrBufPeek(StrBuf *Buf, const char* ptr, long nThChar, char PeekValue);
+long StrBufPook(StrBuf *Buf, const char* ptr, long nThChar, long nChars, char PookValue);
 
 int StrBufTCP_read_line(StrBuf *buf, int *fd, int append, const char **Error);
 int StrBufReadBLOB(StrBuf *Buf, int *fd, int append, long nBytes, const char **Error);
@@ -303,6 +213,7 @@ int StrBufTCP_read_buffered_line_fast(StrBuf *Line,
 				      const char **Error);
 
 int StrBufSipLine(StrBuf *LineBuf, StrBuf *Buf, const char **Ptr);
+int StrBufReplaceToken(StrBuf *Buf, long where, long HowLong, const char *Repl, long ReplLen);
 int StrBufExtract_token(StrBuf *dest, const StrBuf *Source, int parmnum, char separator);
 int StrBufSub(StrBuf *dest, const StrBuf *Source, unsigned long Offset, size_t nChars);
 
@@ -333,6 +244,7 @@ void StrBufCutLeft(StrBuf *Buf, int nChars);
 void StrBufCutRight(StrBuf *Buf, int nChars);
 void StrBufCutAt(StrBuf *Buf, int AfternChars, const char *At);
 void StrBufTrim(StrBuf *Buf);
+void StrBufStripAllBut(StrBuf *Buf, char leftboundary, char rightboundary);
 void StrBufUpCase(StrBuf *Buf);
 void StrBufLowerCase(StrBuf *Buf);
 void StrBufStripSlashes(StrBuf *Dir, int RemoveTrailingSlash);
@@ -349,6 +261,10 @@ void StrBuf_RFC822_to_Utf8(StrBuf *Target, const StrBuf *DecodeMe, const StrBuf*
 int StrBufDecodeBase64(StrBuf *Buf);
 int StrBufDecodeHex(StrBuf *Buf);
 int StrBufRFC2047encode(StrBuf **target, const StrBuf *source);
+StrBuf *StrBufSanitizeEmailRecipientVector(const StrBuf *Recp, 
+					   StrBuf *UserName, 
+					   StrBuf *EmailAddress,
+					   StrBuf *EncBuf);
 int StrBufSanitizeAscii(StrBuf *Buf, const char Mute);
 #define LB			(1)		/* Internal escape chars */
 #define RB			(2)
@@ -398,8 +314,10 @@ int haschar(const char *st, int ch);
 void remove_token(char *source, int parmnum, char separator);
 void fmt_date(char *buf, size_t n, time_t thetime, int seconds);
 int is_msg_in_sequence_set(const char *mset, long msgnum);
-const char *memreadline(const char *start, char *buf, int maxlen);
+char *memreadline(char *start, char *buf, int maxlen);
 char *memreadlinelen(char *start, char *buf, int maxlen, int *retlen);
+const char *cmemreadline(const char *start, char *buf, int maxlen);
+const char *cmemreadlinelen(const char *start, char *buf, int maxlen, int *retlen);
 #define IsEmptyStr(a) ((a)[0] == '\0')
 #define num_parms(source)		num_tokens(source,(char)'|')
 int stripout(char *str, char leftboundary, char rightboundary);
@@ -409,8 +327,10 @@ void urlesc(char *outbuf, size_t oblen, char *strbuf);
 char *CtdlTempFileName(char *prefix1, int prefix2);
 FILE *CtdlTempFile(void);
 void generate_uuid(char *buf);
-const char *bmstrcasestr(const char *text, const char *pattern);
-const char *bmstrcasestr_len(const char *text, size_t textlen, const char *pattern, size_t patlen);
+char *bmstrcasestr(char *text, const char *pattern);
+char *bmstrcasestr_len(char *text, size_t textlen, const char *pattern, size_t patlen);
+const char *cbmstrcasestr(const char *text, const char *pattern);
+const char *cbmstrcasestr_len(const char *text, size_t textlen, const char *pattern, size_t patlen);
 void CtdlMakeTempFileName(char *name, int len);
 char *rfc2047encode(char *line, long length);
 int is_msg_in_mset(const char *mset, long msgnum);
@@ -485,6 +405,8 @@ int GetHashPosFromKey(HashList *Hash, const char *HKey, long HKLen, HashPos *At)
 int DeleteEntryFromHash(HashList *Hash, HashPos *At);
 int GetHashPosCounter(HashList *Hash, HashPos *At);
 void DeleteHashPos(HashPos **DelMe);
+int NextHashPos(HashList *Hash, HashPos *At);
+int GetHashPos(HashList *Hash, HashPos *At, long *HKLen, const char **HashKey, void **Data);
 int GetNextHashPos(HashList *Hash, HashPos *At, long *HKLen, const char **HashKey, void **Data);
 int GetHashAt(HashList *Hash,long At, long *HKLen, const char **HashKey, void **Data);
 void SortByHashKey(HashList *Hash, int Order);
@@ -492,12 +414,12 @@ void SortByHashKeyStr(HashList *Hash);
 int GetCount(HashList *Hash);
 const void *GetSearchPayload(const void *HashVoid);
 void SortByPayload(HashList *Hash, CompareFunc SortBy);
-void generic_free_handler(void *ptr);
 void reference_free_handler(void *ptr);
 int HashLittle(const void *key, size_t length);
 
 
 void convert_spaces_to_underscores(char *str);
+int CheckEncode(const char *pch, long len, const char *pche);
 
 /*
  * Convert 4 bytes char into an Integer.