X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Flibcitadel.h;h=b6e9cb1f89ce0ea6138a60baa7d00ef90890aa0a;hb=954e5749b5e0102f8598fcc19fc10267f31a6cda;hp=a6d66c5ecc0812505a4a5e1086a5e99d478edee5;hpb=f3ea7e42ffad69e9e00213691039c0ed1d5a8ff6;p=citadel.git diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index a6d66c5ec..b6e9cb1f8 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -1,23 +1,16 @@ /* * Header file for libcitadel * - * Copyright (c) 1987-2018 by the citadel.org team + * Copyright (c) 1987-2022 by the citadel.org team * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. +// This program is open source software. Use, duplication, or disclosure +// is subject to the terms of the GNU General Public License, version 3. */ - /* protect against double includes */ #ifndef LIBCITADEL_H #define LIBCITADEL_H - /* * since we reference time_t... */ @@ -28,7 +21,7 @@ #include #include -#define LIBCITADEL_VERSION_NUMBER 917 +#define LIBCITADEL_VERSION_NUMBER 957 /* * Here's a bunch of stupid magic to make the MIME parser portable. @@ -37,7 +30,6 @@ #define SIZ 4096 #endif - typedef enum AXLevel { AxDeleted = 0, AxNewU = 1, @@ -100,7 +92,6 @@ typedef enum _room_views { VIEW_DRAFTS = 9, /* Drafts view */ VIEW_BLOG = 10, /* Blog view */ VIEW_QUEUE = 11, /* SMTP/... QUEUE rooms */ - VIEW_WIKIMD = 12, /* Markdown Wiki view */ VIEW_MAX, VIEW_JSON_LIST, } ROOM_VIEWS; @@ -123,7 +114,6 @@ extern const char *StrBufNOTNULL; char *libcitadel_version_string(void); int libcitadel_version_number(void); -void StartLibCitadel(size_t basesize); void ShutDownLibCitadel(void); /* @@ -152,9 +142,8 @@ void mime_parser(char *content_start, char *content_end, void *userdata, int dont_decode); - - char *fixed_partnum(char *); + void mime_decode(char *partnum, char *part_start, size_t length, char *content_type, char *charset, char *encoding, @@ -166,11 +155,13 @@ void mime_decode(char *partnum, MimeParserCallBackType PostMultiPartCallBack, void *userdata, int dont_decode); + int mime_decode_now (char *part_start, size_t length, char *encoding, char **decoded, size_t *bytes_decoded); + void the_mime_parser(char *partnum, char *content_start, char *content_end, MimeParserCallBackType CallBack, @@ -196,7 +187,6 @@ void SwapBuffers(StrBuf *A, StrBuf *B); long StrBufShrinkToFit(StrBuf *Buf, int Force); void ReAdjustEmptyBuf(StrBuf *Buf, long ThreshHold, long NewSize); void NewStrBufDupAppendFlush(StrBuf **CreateRelpaceMe, StrBuf *CopyFlushMe, const char *NoMe, int KeepOriginal); - int StrBufPlain(StrBuf *Buf, const char* ptr, int nChars); StrBuf* _NewConstStrBuf(const char* StringConstant, size_t SizeOfStrConstant); #define NewConstStrBuf(a) _NewConstStrBuf(a, sizeof(a)) @@ -205,14 +195,12 @@ 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) void StrBufAsciify(StrBuf *Buf, const char repl); 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 @@ -254,28 +242,6 @@ typedef struct _file_buffer { int nBlobBytesWanted; } IOBuffer; - -typedef struct __fd_iobuffer { - IOBuffer *IOB; - int OtherFD; - int SplicePipe[2]; - int PipeSize; - long TotalSendSize; - loff_t TotalSentAlready; - loff_t TotalReadAlready; - long ChunkSize; - long ChunkSendRemain; - StrBuf *ChunkBuffer; /* just used if we don't have sendfile */ -} FDIOBuffer; - - -void FDIOBufferInit(FDIOBuffer *FDB, IOBuffer *IO, int FD, long TotalSendSize); -void FDIOBufferDelete(FDIOBuffer *FDB); -int FileSendChunked(FDIOBuffer *FDB, const char **Err); -int FileRecvChunked(FDIOBuffer *FDB, const char **Err); -int FileMoveChunked(FDIOBuffer *FDB, const char **Err); -eReadState WriteIOBAlreadyRead(FDIOBuffer *FDB, const char **Error); - long StrBuf_read_one_chunk_callback (int fd, short event, IOBuffer *FB); int StrBuf_write_one_chunk_callback(int fd, short event, IOBuffer *FB); @@ -340,8 +306,8 @@ void StrBuf_RFC822_2_Utf8(StrBuf *Target, void StrBuf_RFC822_to_Utf8(StrBuf *Target, const StrBuf *DecodeMe, const StrBuf* DefaultCharset, StrBuf *FoundCharset); typedef enum __eStreamType { - eBase64Encode, - eBase64Decode, + //eBase64Encode, + //eBase64Decode, eZLibEncode, eZLibDecode, eEmtyCodec @@ -434,7 +400,11 @@ long extract_long (const char *source, int parmnum); unsigned long extract_unsigned_long(const char *source, int parmnum); void CtdlInitBase64Table(void); size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int linebreaks); -int CtdlDecodeBase64(char *dest, const char *source, size_t length); +enum { + BASE64_NO_LINEBREAKS = 0, + BASE64_YES_LINEBREAKS = 1 +}; +size_t CtdlDecodeBase64(char *dest, const char *source, size_t length); unsigned int decode_hex(char *Source); int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen); void StripSlashes(char *Dir, int TrailingSlash); @@ -463,9 +433,25 @@ char *rfc2047encode(const char *line, long length); int is_msg_in_mset(const char *mset, long msgnum); int pattern2(char *search, char *patn); void stripltlen(char *, int *); -char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth, int do_citaformat); +char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth); void LoadEntityList(char *FileName); +void utf8ify_rfc822_string(char *buf); + +typedef struct { + void *the_elements; + size_t element_size; + int num_elements; + int num_alloc; +} Array; + +Array *array_new(size_t element_size); +void array_free(Array *arr); +void array_append(Array *arr, void *new_element); +void *array_get_element_at(Array *arr, int index); +int array_len(Array *arr); +void array_sort(Array *arr, int (*compar)(const void *, const void *)); +void array_delete_element_at(Array *arr, int index); /* vCard stuff */ @@ -613,7 +599,11 @@ JsonValue *NewJsonNumber(const char *Key, long keylen, long Number); JsonValue *NewJsonBigNumber(const char *Key, long keylen, double Number); -JsonValue *NewJsonString(const char *Key, long keylen, StrBuf *CopyMe); +enum { + NEWJSONSTRING_COPYBUF, // make a copy of the StrBuf, source is left alone + NEWJSONSTRING_SMASHBUF // smash the source StrBuf, the json object now owns that memory +}; +JsonValue *NewJsonString(const char *Key, long keylen, StrBuf *CopyMe, int copy_or_smash); JsonValue *NewJsonPlainString(const char *Key, long keylen, const char *CopyMe, long len); @@ -628,12 +618,7 @@ void JsonObjectAppend(JsonValue *Array, JsonValue *Val); void SerializeJson(StrBuf *Target, JsonValue *Val, int FreeVal); - -/* - * Citadels Wildfire implementation, see - * http://www.firephp.org/Wiki/Reference/Protocol - * and http://wildfirehq.org/ for details - */ +/* the following declarations are leftover from the defunct wildfire implementation. can we remove them? */ typedef void (*AddHeaderFunc)(const char *HdrName, const char *HdrValue); typedef enum _WF_MessageType { @@ -687,8 +672,9 @@ extern "C" { #define CFG_SMTP_FROM_NOFILTER 1 #define CFG_SMTP_FROM_CORRECT 2 #define CFG_SMTP_FROM_REJECT 3 + /* - * MIME types used in Citadel for configuration stuff + * object types used in Citadel for configuration stuff (some of these are obsolete) */ #define SPOOLMIME "application/x-citadel-delivery-list" #define INTERNETCFG "application/x-citadel-internet-config" @@ -697,6 +683,7 @@ extern "C" { #define FILTERLIST "application/x-citadel-filter-list" #define SIEVECONFIG "application/x-citadel-sieve-config" #define XMPPMORTUARY "application/x-citadel-xmpp-mortuary" +#define GLOBAL_ALIASES "global_alias_table" #define FILE_MAILALIAS "__MAIL_ALIAS__"