X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Flibcitadel.h;h=dc921fef3659384bbe38dda9b4b1899751cf1c48;hb=c08adcea52e85d6139ad158c17eb3d1941df2eb5;hp=0f4f6e2d19e6f8ff2fe69d2ff4b7fcdc7c8b6727;hpb=cbbb4129e997a98797761388947dedd9edc4baef;p=citadel.git diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 0f4f6e2d1..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 #include #include -#define LIBCITADEL_VERSION_NUMBER 760 +#define LIBCITADEL_VERSION_NUMBER 786 /* * Here's a bunch of stupid magic to make the MIME parser portable. @@ -45,6 +40,37 @@ enum LogLevel { CTDL_DEBUG /* debug-level messages */ }; +typedef enum AXLevel { + AxDeleted = 0, + AxNewU = 1, + AxProbU = 2, + AxLocU = 3, + AxNetU = 4, + AxPrefU = 5, + AxAideU = 6 +}eUsrAxlvl; + +enum RoomNetCfg { + subpending, + unsubpending, + lastsent, /* Server internal use only */ + ignet_push_share, + listrecp, + digestrecp, + pop3client, + rssclient, + participate, + maxRoomNetCfg +}; + + +typedef enum __GPEXWhichPolicy { + roompolicy, + floorpolicy, + sitepolicy, + mailboxespolicy, + maxpolicy +}GPEXWhichPolicy; /* * View definitions. @@ -59,66 +85,53 @@ enum LogLevel { #define VIEW_WIKI 6 /* Wiki view */ #define VIEW_CALBRIEF 7 /* Brief Calendar view */ #define VIEW_JOURNAL 8 /* Journal view */ +#define VIEW_BLOG 9 /* Blog view (not yet implemented) */ #ifndef IsEmptyStr #define IsEmptyStr(a) ((a)[0] == '\0') #endif + +/* + * another word to indicate n/a for a pointer if NULL already has a "meaning" + */ +extern const char *StrBufNOTNULL; + /* * Misc declarations */ char *libcitadel_version_string(void); int libcitadel_version_number(void); +void StartLibCitadel(size_t basesize); void ShutDownLibCitadel(void); /* * MIME parser declarations */ -void extract_key(char *target, char *source, long sourcelen, char *key, long keylen); +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); @@ -129,118 +142,61 @@ 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; }ConstStr; - +#define CKEY(a) (a).Key, (a).len StrBuf* NewStrBuf(void); StrBuf* NewStrBufDup(const StrBuf *CopyMe); StrBuf* NewStrBufPlain(const char* ptr, int nChars); +long StrBufShrinkToFit(StrBuf *Buf, int Force); +void ReAdjustEmptyBuf(StrBuf *Buf, long ThreshHold, long NewSize); + int StrBufPlain(StrBuf *Buf, const char* ptr, int nChars); StrBuf* _NewConstStrBuf(const char* StringConstant, size_t SizeOfStrConstant); #define NewConstStrBuf(a) _NewConstStrBuf(a, sizeof(a)) void FreeStrBuf (StrBuf **FreeMe); +char *SmashStrBuf (StrBuf **SmashMe); void HFreeStrBuf (void *VFreeMe); int FlushStrBuf(StrBuf *buf); +int FLUSHStrBuf(StrBuf *buf); /* expensive but doesn't leave content behind for others to find in case of errors */ 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); +#define NNN_TERM 1 +#define O_TERM 0 int StrBufReadBLOBBuffered(StrBuf *Buf, StrBuf *IOBuf, const char **BufPos, int *fd, int append, long nBytes, + int check, const char **Error); int StrBufTCP_read_buffered_line(StrBuf *Line, StrBuf *buf, @@ -257,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); @@ -266,6 +223,7 @@ int StrBufExtract_int(const StrBuf* Source, int parmnum, char separator); int StrBufNum_tokens(const StrBuf *source, char tok); int StrBufRemove_token(StrBuf *Source, int parmnum, char separator); +int StrBufHaveNextToken(const StrBuf *Source, const char **pStart); int StrBufExtract_NextToken(StrBuf *dest, const StrBuf *Source, const char **pStart, char separator); int StrBufSkip_NTokenS(const StrBuf *Source, const char **pStart, char separator, int nTokens); unsigned long StrBufExtractNext_unsigned_long(const StrBuf* Source, const char **pStart, char separator); @@ -275,6 +233,7 @@ int StrBufExtractNext_int(const StrBuf* Source, const char **pStart, char separa void StrBufAppendBufPlain(StrBuf *Buf, const char *AppendBuf, long AppendSize, unsigned long Offset); void StrBufAppendBuf(StrBuf *Buf, const StrBuf *AppendBuf, unsigned long Offset); +size_t CurlFillStrBuf_callback(void *ptr, size_t size, size_t nmemb, void *stream); void StrBufAppendPrintf(StrBuf *Buf, const char *format, ...); #ifdef SHOW_ME_VAPPEND_PRINTF /* so owe don't create an include depndency, this is just visible on demand. */ @@ -285,11 +244,14 @@ 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); void StrBufEUid_unescapize(StrBuf *target, const StrBuf *source); void StrBufEUid_escapize(StrBuf *target, const StrBuf *source); +void StrBufToUnixLF(StrBuf *buf); void StrBufReplaceChars(StrBuf *buf, char search, char replace); int CompressBuffer(StrBuf *Buf); @@ -297,15 +259,23 @@ void StrBufConvert(StrBuf *ConvertBuf, StrBuf *TmpBuf, void *pic); void ctdl_iconv_open(const char *tocode, const char *fromcode, void *pic); void StrBuf_RFC822_to_Utf8(StrBuf *Target, const StrBuf *DecodeMe, const StrBuf* DefaultCharset, StrBuf *FoundCharset); 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) #define QU (3) void StrBufUrlescAppend(StrBuf *OutBuf, const StrBuf *In, const char *PlainIn); +void StrBufHexescAppend(StrBuf *OutBuf, const StrBuf *In, const char *PlainIn); long StrEscAppend(StrBuf *Target, const StrBuf *Source, const char *PlainIn, int nbsp, int nolinebreaks); long StrECMAEscAppend(StrBuf *Target, const StrBuf *Source, const char *PlainIn); -void StrMsgEscAppend(StrBuf *Target, StrBuf *Source, const char *PlainIn); +long StrHtmlEcmaEscAppend(StrBuf *Target, const StrBuf *Source, const char *PlainIn, int nbsp, int nolinebreaks); +void StrMsgEscAppend(StrBuf *Target, const StrBuf *Source, const char *PlainIn); +void StrIcalEscAppend(StrBuf *Target, const StrBuf *Source, const char *PlainIn); long StrTol(const StrBuf *Buf); int StrToi(const StrBuf *Buf); @@ -325,11 +295,6 @@ const char *GetIconFilename(char *MimeType, size_t len); /* tools */ -int Ctdl_IsUtf8SequenceStart(char Char); -int Ctdl_GetUtf8SequenceLength(char Char); -int Ctdl_Utf8StrLen(char *str); -char *Ctdl_Utf8StrCut(char *str, int maxlen); - int safestrncpy(char *dest, const char *src, size_t n); int num_tokens (const char *source, char tok); @@ -343,13 +308,16 @@ size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int li int CtdlDecodeBase64(char *dest, const char *source, size_t length); unsigned int decode_hex(char *Source); int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen); -long striplt(char *); +void StripSlashes(char *Dir, int TrailingSlash); +size_t striplt(char *); 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); 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); @@ -359,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); -char *bmstrcasestr(char *text, char *pattern); -char *bmstrcasestr_len(char *text, size_t textlen, 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); @@ -388,7 +358,9 @@ struct vCard { struct vCard *vcard_new(void); void vcard_add_prop(struct vCard *v, char *propname, char *propvalue); -struct vCard *vcard_load(char *); +struct vCard *vcard_load(char *vtext); +struct vCard *VCardLoad(StrBuf *vbtext); + void vcard_free(struct vCard *); void vcard_set_prop(struct vCard *v, char *name, char *value, int append); char *vcard_get_prop(struct vCard *v, char *propname, int is_partial, @@ -417,7 +389,7 @@ typedef void (*TransitionFunc) (void *Item1, void *Item2, int Odd); typedef void (*PrintHashDataFunc) (const char *Key, void *Item, int Odd); int Flathash(const char *str, long len); -#define IKEY(a) (const char*)(&((int)a)), sizeof(int) +#define IKEY(a) (const char*) &a, sizeof(a) HashList *NewHash(int Uniq, HashFunc F); void DeleteHash(HashList **Hash); @@ -429,8 +401,12 @@ int GetHashKeys(HashList *Hash, char ***List); int dbg_PrintHash(HashList *Hash, PrintHashContent first, PrintHashContent Second); int PrintHash(HashList *Hash, TransitionFunc Trans, PrintHashDataFunc PrintEntry); HashPos *GetNewHashPos(HashList *Hash, int StepWidth); -int GetHashPosCounter(HashPos *At); +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); @@ -438,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.