X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fimap_fetch.c;h=293fecca019eec5c160b7c7531a63cfd4c32f818;hp=66dd774fa03b5a6bd5154da1544f6584b5bc922e;hb=5ac2920028e92a453c686c799327d7a66b3e7b49;hpb=23ad1aef26234b974b18aa30cdccd3cc1767f496 diff --git a/citadel/modules/imap/imap_fetch.c b/citadel/modules/imap/imap_fetch.c index 66dd774fa..293fecca0 100644 --- a/citadel/modules/imap/imap_fetch.c +++ b/citadel/modules/imap/imap_fetch.c @@ -1,24 +1,18 @@ /* - * $Id$ - * * Implements the FETCH command in IMAP. * This is a good example of the protocol's gratuitous complexity. * - * Copyright (c) 2001-2009 by the citadel.org team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * Copyright (c) 2001-2020 by the citadel.org team * - * 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; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 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. */ @@ -58,8 +52,8 @@ #include "database.h" #include "msgbase.h" #include "internet_addressing.h" -#include "imap_tools.h" #include "serv_imap.h" +#include "imap_tools.h" #include "imap_fetch.h" #include "genstamp.h" #include "ctdl_module.h" @@ -71,33 +65,39 @@ */ void imap_fetch_uid(int seq) { - cprintf("UID %ld", IMAP->msgids[seq-1]); + IAPrintf("UID %ld", IMAP->msgids[seq-1]); } -void imap_fetch_flags(int seq) { +void imap_fetch_flags(int seq) +{ + citimap *Imap = IMAP; int num_flags_printed = 0; - cprintf("FLAGS ("); - if (IMAP->flags[seq] & IMAP_DELETED) { - if (num_flags_printed > 0) cprintf(" "); - cprintf("\\Deleted"); + IAPuts("FLAGS ("); + if (Imap->flags[seq] & IMAP_DELETED) { + if (num_flags_printed > 0) + IAPuts(" "); + IAPuts("\\Deleted"); ++num_flags_printed; } - if (IMAP->flags[seq] & IMAP_SEEN) { - if (num_flags_printed > 0) cprintf(" "); - cprintf("\\Seen"); + if (Imap->flags[seq] & IMAP_SEEN) { + if (num_flags_printed > 0) + IAPuts(" "); + IAPuts("\\Seen"); ++num_flags_printed; } - if (IMAP->flags[seq] & IMAP_ANSWERED) { - if (num_flags_printed > 0) cprintf(" "); - cprintf("\\Answered"); + if (Imap->flags[seq] & IMAP_ANSWERED) { + if (num_flags_printed > 0) + IAPuts(" "); + IAPuts("\\Answered"); ++num_flags_printed; } - if (IMAP->flags[seq] & IMAP_RECENT) { - if (num_flags_printed > 0) cprintf(" "); - cprintf("\\Recent"); + if (Imap->flags[seq] & IMAP_RECENT) { + if (num_flags_printed > 0) + IAPuts(" "); + IAPuts("\\Recent"); ++num_flags_printed; } - cprintf(")"); + IAPuts(")"); } @@ -106,15 +106,15 @@ void imap_fetch_internaldate(struct CtdlMessage *msg) { time_t msgdate; if (!msg) return; - if (msg->cm_fields['T'] != NULL) { - msgdate = atol(msg->cm_fields['T']); + if (!CM_IsEmpty(msg, eTimestamp)) { + msgdate = atol(msg->cm_fields[eTimestamp]); } else { msgdate = time(NULL); } datestring(datebuf, sizeof datebuf, msgdate, DATESTRING_IMAP); - cprintf("INTERNALDATE \"%s\"", datebuf); + IAPrintf( "INTERNALDATE \"%s\"", datebuf); } @@ -128,20 +128,20 @@ void imap_fetch_internaldate(struct CtdlMessage *msg) { * "RFC822.TEXT" body only (without leading blank line) */ void imap_fetch_rfc822(long msgnum, const char *whichfmt) { + CitContext *CCC = CC; + citimap *Imap = CCCIMAP; const char *ptr = NULL; size_t headers_size, text_size, total_size; size_t bytes_to_send = 0; struct MetaData smi; int need_to_rewrite_metadata = 0; int need_body = 0; - CitContext *CCC = CC; /* Determine whether this particular fetch operation requires * us to fetch the message body from disk. If not, we can save * on some disk operations... */ - if ( (!strcasecmp(whichfmt, "RFC822")) - || (!strcasecmp(whichfmt, "RFC822.TEXT")) ) { + if ( (!strcasecmp(whichfmt, "RFC822")) || (!strcasecmp(whichfmt, "RFC822.TEXT")) ) { need_body = 1; } @@ -151,7 +151,7 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) { if (!strcasecmp(whichfmt, "RFC822.SIZE")) { GetMetaData(&smi, msgnum); if (smi.meta_rfc822_length > 0L) { - cprintf("RFC822.SIZE %ld", smi.meta_rfc822_length); + IAPrintf("RFC822.SIZE %ld", smi.meta_rfc822_length); return; } need_to_rewrite_metadata = 1; @@ -164,37 +164,39 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) { * client requests something that involves reading the message * body, but we haven't fetched the body yet. */ - if ((IMAP->cached_rfc822 != NULL) - && (IMAP->cached_rfc822_msgnum == msgnum) - && (IMAP->cached_rfc822_withbody || (!need_body)) ) { + if ((Imap->cached_rfc822 != NULL) + && (Imap->cached_rfc822_msgnum == msgnum) + && (Imap->cached_rfc822_withbody || (!need_body)) ) { /* Good to go! */ } - else if (IMAP->cached_rfc822 != NULL) { + else if (Imap->cached_rfc822 != NULL) { /* Some other message is cached -- free it */ - FreeStrBuf(&IMAP->cached_rfc822); - IMAP->cached_rfc822_msgnum = (-1); + FreeStrBuf(&Imap->cached_rfc822); + Imap->cached_rfc822_msgnum = (-1); } /* At this point, we now can fetch and convert the message iff it's not * the one we had cached. */ - if (IMAP->cached_rfc822 == NULL) { + if (Imap->cached_rfc822 == NULL) { /* * Load the message into memory for translation & measurement */ CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ); CtdlOutputMsg(msgnum, MT_RFC822, (need_body ? HEADERS_ALL : HEADERS_FAST), - 0, 1, NULL, SUPPRESS_ENV_TO + 0, 1, NULL, SUPPRESS_ENV_TO, NULL, NULL, NULL ); - if (!need_body) cprintf("\r\n"); /* extra trailing newline */ - IMAP->cached_rfc822 = CCC->redirect_buffer; + if (!need_body) { + client_write(HKEY("\r\n")); // extra trailing newline -- to the redirect_buffer, *not* to the client + } + Imap->cached_rfc822 = CCC->redirect_buffer; CCC->redirect_buffer = NULL; - IMAP->cached_rfc822_msgnum = msgnum; - IMAP->cached_rfc822_withbody = need_body; + Imap->cached_rfc822_msgnum = msgnum; + Imap->cached_rfc822_withbody = need_body; if ( (need_to_rewrite_metadata) && - (StrLength(IMAP->cached_rfc822) > 0) ) { - smi.meta_rfc822_length = StrLength(IMAP->cached_rfc822); + (StrLength(Imap->cached_rfc822) > 0) ) { + smi.meta_rfc822_length = StrLength(Imap->cached_rfc822); PutMetaData(&smi); } } @@ -204,14 +206,12 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) { * intervening blank line to be part of the headers, not the text. */ headers_size = 0; - text_size = 0; - total_size = 0; if (need_body) { StrBuf *Line = NewStrBuf(); ptr = NULL; do { - StrBufSipLine(Line, IMAP->cached_rfc822, &ptr); + StrBufSipLine(Line, Imap->cached_rfc822, &ptr); if ((StrLength(Line) != 0) && (ptr != StrBufNOTNULL)) { @@ -219,54 +219,48 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) { if ((StrLength(Line) != 0) && (ptr != StrBufNOTNULL) ) { - headers_size = ptr - ChrPtr(IMAP->cached_rfc822); + headers_size = ptr - ChrPtr(Imap->cached_rfc822); } } } while ( (headers_size == 0) && (ptr != StrBufNOTNULL) ); - total_size = StrLength(IMAP->cached_rfc822); + total_size = StrLength(Imap->cached_rfc822); text_size = total_size - headers_size; FreeStrBuf(&Line); } else { - headers_size = - total_size = StrLength(IMAP->cached_rfc822); + headers_size = total_size = StrLength(Imap->cached_rfc822); text_size = 0; } - CtdlLogPrintf(CTDL_DEBUG, - "RFC822: headers=" SIZE_T_FMT - ", text=" SIZE_T_FMT - ", total=" SIZE_T_FMT "\n", - headers_size, text_size, total_size); + syslog(LOG_DEBUG, "imap: RFC822 headers=" SIZE_T_FMT ", text=" SIZE_T_FMT ", total=" SIZE_T_FMT, headers_size, text_size, total_size); if (!strcasecmp(whichfmt, "RFC822.SIZE")) { - cprintf("RFC822.SIZE " SIZE_T_FMT, total_size); + IAPrintf("RFC822.SIZE " SIZE_T_FMT, total_size); return; } else if (!strcasecmp(whichfmt, "RFC822")) { - ptr = ChrPtr(IMAP->cached_rfc822); + ptr = ChrPtr(Imap->cached_rfc822); bytes_to_send = total_size; } else if (!strcasecmp(whichfmt, "RFC822.HEADER")) { - ptr = ChrPtr(IMAP->cached_rfc822); + ptr = ChrPtr(Imap->cached_rfc822); bytes_to_send = headers_size; } else if (!strcasecmp(whichfmt, "RFC822.TEXT")) { - ptr = &ChrPtr(IMAP->cached_rfc822)[headers_size]; + ptr = &ChrPtr(Imap->cached_rfc822)[headers_size]; bytes_to_send = text_size; } - cprintf("%s {" SIZE_T_FMT "}\r\n", whichfmt, bytes_to_send); - client_write(ptr, bytes_to_send); + IAPrintf("%s {" SIZE_T_FMT "}\r\n", whichfmt, bytes_to_send); + iaputs(ptr, bytes_to_send); } - /* * Load a specific part of a message into the temp file to be output to a * client. FIXME we can handle parts like "2" and "2.1" and even "2.MIME" @@ -280,41 +274,49 @@ void imap_load_part(char *name, char *filename, char *partnum, char *disp, char *cbid, void *cbuserdata) { char mimebuf2[SIZ]; - char *desired_section; + StrBuf *desired_section; - desired_section = (char *)cbuserdata; - CtdlLogPrintf(CTDL_DEBUG, "imap_load_part() looking for %s, found %s\n", - desired_section, - partnum - ); + desired_section = (StrBuf *)cbuserdata; + syslog(LOG_DEBUG, "imap: imap_load_part() looking for %s, found %s", ChrPtr(desired_section), partnum); - if (!strcasecmp(partnum, desired_section)) { + if (!strcasecmp(partnum, ChrPtr(desired_section))) { client_write(content, length); } snprintf(mimebuf2, sizeof mimebuf2, "%s.MIME", partnum); - if (!strcasecmp(desired_section, mimebuf2)) { - cprintf("Content-type: %s", cbtype); - if (!IsEmptyStr(cbcharset)) - cprintf("; charset=\"%s\"", cbcharset); - if (!IsEmptyStr(name)) - cprintf("; name=\"%s\"", name); - cprintf("\r\n"); - if (!IsEmptyStr(encoding)) - cprintf("Content-Transfer-Encoding: %s\r\n", encoding); + if (!strcasecmp(ChrPtr(desired_section), mimebuf2)) { + client_write(HKEY("Content-type: ")); + client_write(cbtype, strlen(cbtype)); + if (!IsEmptyStr(cbcharset)) { + client_write(HKEY("; charset=\"")); + client_write(cbcharset, strlen(cbcharset)); + client_write(HKEY("\"")); + } + if (!IsEmptyStr(name)) { + client_write(HKEY("; name=\"")); + client_write(name, strlen(name)); + client_write(HKEY("\"")); + } + client_write(HKEY("\r\n")); if (!IsEmptyStr(encoding)) { - cprintf("Content-Disposition: %s", disp); + client_write(HKEY("Content-Transfer-Encoding: ")); + client_write(encoding, strlen(encoding)); + client_write(HKEY("\r\n")); + } + if (!IsEmptyStr(encoding)) { + client_write(HKEY("Content-Disposition: ")); + client_write(disp, strlen(disp)); + if (!IsEmptyStr(filename)) { - cprintf("; filename=\"%s\"", filename); + client_write(HKEY("; filename=\"")); + client_write(filename, strlen(filename)); + client_write(HKEY("\"")); } - cprintf("\r\n"); + client_write(HKEY("\r\n")); } - cprintf("Content-Length: %ld\r\n", (long)length); - cprintf("\r\n"); + cprintf("Content-Length: %ld\r\n\r\n", (long)length); } - - } @@ -330,42 +332,35 @@ void imap_output_envelope_from(struct CtdlMessage *msg) { /* For anonymous messages, it's so easy! */ if (!is_room_aide() && (msg->cm_anon_type == MES_ANONONLY)) { - cprintf("((\"----\" NIL \"x\" \"x.org\")) "); + IAPuts("((\"----\" NIL \"x\" \"x.org\")) "); return; } if (!is_room_aide() && (msg->cm_anon_type == MES_ANONOPT)) { - cprintf("((\"anonymous\" NIL \"x\" \"x.org\")) "); + IAPuts("((\"anonymous\" NIL \"x\" \"x.org\")) "); return; } /* For everything else, we do stuff. */ - cprintf("(("); /* open double-parens */ - plain_imap_strout(msg->cm_fields['A']); /* personal name */ - cprintf(" NIL "); /* source route (not used) */ + IAPuts("(("); // open double-parens + IPutMsgField(eAuthor); // display name + IAPuts(" NIL "); // source route (not used) - - if (msg->cm_fields['F'] != NULL) { - process_rfc822_addr(msg->cm_fields['F'], user, node, name); - plain_imap_strout(user); /* mailbox name (user id) */ - cprintf(" "); - if (!strcasecmp(node, config.c_nodename)) { - plain_imap_strout(config.c_fqdn); - } - else { - plain_imap_strout(node); /* host name */ - } + if (!CM_IsEmpty(msg, erFc822Addr)) { + process_rfc822_addr(msg->cm_fields[erFc822Addr], user, node, name); + IPutStr(user, strlen(user)); /* mailbox name (user id) */ + IAPuts(" "); + IPutStr(node, strlen(node)); /* host name */ } else { - plain_imap_strout(msg->cm_fields['A']); /* mailbox name (user id) */ - cprintf(" "); - plain_imap_strout(msg->cm_fields['N']); /* host name */ + IPutMsgField(eAuthor); /* Make up a synthetic address */ + IAPuts(" "); + IPutStr(CtdlGetConfigStr("c_fqdn"), strlen(CtdlGetConfigStr("c_fqdn"))); } - cprintf(")) "); /* close double-parens */ + IAPuts(")) "); /* close double-parens */ } - /* * Output an envelope address (or set of addresses) in the official, * convoluted, braindead format. (Note that we can't use this for @@ -381,16 +376,16 @@ void imap_output_envelope_addr(char *addr) { char name[256]; if (addr == NULL) { - cprintf("NIL "); + IAPuts("NIL "); return; } if (IsEmptyStr(addr)) { - cprintf("NIL "); + IAPuts("NIL "); return; } - cprintf("("); + IAPuts("("); /* How many addresses are listed here? */ num_addrs = num_tokens(addr, ','); @@ -400,17 +395,18 @@ void imap_output_envelope_addr(char *addr) { extract_token(individual_addr, addr, i, ',', sizeof individual_addr); striplt(individual_addr); process_rfc822_addr(individual_addr, user, node, name); - cprintf("("); - plain_imap_strout(name); - cprintf(" NIL "); - plain_imap_strout(user); - cprintf(" "); - plain_imap_strout(node); - cprintf(")"); - if (i < (num_addrs-1)) cprintf(" "); - } - - cprintf(") "); + IAPuts("("); + IPutStr(name, strlen(name)); + IAPuts(" NIL "); + IPutStr(user, strlen(user)); + IAPuts(" "); + IPutStr(node, strlen(node)); + IAPuts(")"); + if (i < (num_addrs-1)) + IAPuts(" "); + } + + IAPuts(") "); } @@ -424,39 +420,39 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { char datestringbuf[SIZ]; time_t msgdate; char *fieldptr = NULL; + long len; if (!msg) return; /* Parse the message date into an IMAP-format date string */ - if (msg->cm_fields['T'] != NULL) { - msgdate = atol(msg->cm_fields['T']); + if (!CM_IsEmpty(msg, eTimestamp)) { + msgdate = atol(msg->cm_fields[eTimestamp]); } else { msgdate = time(NULL); } - datestring(datestringbuf, sizeof datestringbuf, - msgdate, DATESTRING_IMAP); + len = datestring(datestringbuf, sizeof datestringbuf, msgdate, DATESTRING_IMAP); /* Now start spewing data fields. The order is important, as it is * defined by the protocol specification. Nonexistent fields must * be output as NIL, existent fields must be quoted or literalled. * The imap_strout() function conveniently does all this for us. */ - cprintf("ENVELOPE ("); + IAPuts("ENVELOPE ("); /* Date */ - plain_imap_strout(datestringbuf); - cprintf(" "); + IPutStr(datestringbuf, len); + IAPuts(" "); /* Subject */ - plain_imap_strout(msg->cm_fields['U']); - cprintf(" "); + IPutMsgField(eMsgSubject); + IAPuts(" "); /* From */ imap_output_envelope_from(msg); /* Sender (default to same as 'From' if not present) */ - fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Sender"); + fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Sender"); if (fieldptr != NULL) { imap_output_envelope_addr(fieldptr); free(fieldptr); @@ -466,7 +462,7 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { } /* Reply-to */ - fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Reply-to"); + fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Reply-to"); if (fieldptr != NULL) { imap_output_envelope_addr(fieldptr); free(fieldptr); @@ -476,36 +472,64 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { } /* To */ - imap_output_envelope_addr(msg->cm_fields['R']); + imap_output_envelope_addr(msg->cm_fields[eRecipient]); /* Cc (we do it this way because there might be a legacy non-Citadel Cc: field present) */ - fieldptr = msg->cm_fields['Y']; + fieldptr = msg->cm_fields[eCarbonCopY]; if (fieldptr != NULL) { imap_output_envelope_addr(fieldptr); } else { - fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Cc"); + fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Cc"); imap_output_envelope_addr(fieldptr); if (fieldptr != NULL) free(fieldptr); } /* Bcc */ - fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Bcc"); + fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Bcc"); imap_output_envelope_addr(fieldptr); if (fieldptr != NULL) free(fieldptr); /* In-reply-to */ - fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "In-reply-to"); - plain_imap_strout(fieldptr); - cprintf(" "); + fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "In-reply-to"); + IPutStr(fieldptr, (fieldptr)?strlen(fieldptr):0); + IAPuts(" "); if (fieldptr != NULL) free(fieldptr); /* message ID */ - plain_imap_strout(msg->cm_fields['I']); - - cprintf(")"); + len = msg->cm_lengths[emessageId]; + + if ((len == 0) || ( + (msg->cm_fields[emessageId][0] == '<') && + (msg->cm_fields[emessageId][len - 1] == '>')) + ) { + IPutMsgField(emessageId); + } + else + { + char *Buf = malloc(len + 3); + long pos = 0; + + if (msg->cm_fields[emessageId][0] != '<') + { + Buf[pos] = '<'; + pos ++; + } + memcpy(&Buf[pos], msg->cm_fields[emessageId], len); + pos += len; + if (msg->cm_fields[emessageId][len] != '>') + { + Buf[pos] = '>'; + pos++; + } + Buf[pos] = '\0'; + IPutStr(Buf, pos); + free(Buf); + } + IAPuts(")"); } + /* * This function is called only when CC->redirect_buffer contains a set of * RFC822 headers with no body attached. Its job is to strip that set of @@ -557,7 +581,7 @@ void imap_strip_headers(StrBuf *section) { StrBufSipLine(Line, CCC->redirect_buffer, &Ptr); if (!isspace(ChrPtr(Line)[0])) { - ok = 0; + if (doing_headers == 0) ok = 1; else { /* we're supposed to print all headers that are not matching the filter list */ @@ -617,6 +641,7 @@ void imap_fetch_body(long msgnum, ConstStr item, int is_peek) { int need_body = 1; int burn_the_cache = 0; CitContext *CCC = CC; + citimap *Imap = CCCIMAP; /* extract section */ section = NewStrBufPlain(CKEY(item)); @@ -624,30 +649,28 @@ void imap_fetch_body(long msgnum, ConstStr item, int is_peek) { if (strchr(ChrPtr(section), '[') != NULL) { StrBufStripAllBut(section, '[', ']'); } - CtdlLogPrintf(CTDL_DEBUG, "Section is: [%s]\n", - (StrLength(section) == 0) ? "(empty)" : ChrPtr(section) - ); + syslog(LOG_DEBUG, "imap: selected section is [%s]", (StrLength(section) == 0) ? "(empty)" : ChrPtr(section)); /* Burn the cache if we don't have the same section of the * same message again. */ - if (IMAP->cached_body != NULL) { - if (IMAP->cached_bodymsgnum != msgnum) { + if (Imap->cached_body != NULL) { + if (Imap->cached_bodymsgnum != msgnum) { burn_the_cache = 1; } - else if ( (!IMAP->cached_body_withbody) && (need_body) ) { + else if ( (!Imap->cached_body_withbody) && (need_body) ) { burn_the_cache = 1; } - else if (strcasecmp(IMAP->cached_bodypart, ChrPtr(section))) { + else if (strcasecmp(Imap->cached_bodypart, ChrPtr(section))) { burn_the_cache = 1; } if (burn_the_cache) { /* Yup, go ahead and burn the cache. */ - free(IMAP->cached_body); - IMAP->cached_body_len = 0; - IMAP->cached_body = NULL; - IMAP->cached_bodymsgnum = (-1); - strcpy(IMAP->cached_bodypart, ""); + free(Imap->cached_body); + Imap->cached_body_len = 0; + Imap->cached_body = NULL; + Imap->cached_bodymsgnum = (-1); + strcpy(Imap->cached_bodypart, ""); } } @@ -658,13 +681,13 @@ void imap_fetch_body(long msgnum, ConstStr item, int is_peek) { is_partial = 1; } if ( (is_partial == 1) && (StrLength(partial) > 0) ) { - CtdlLogPrintf(CTDL_DEBUG, "Partial is <%s>\n", ChrPtr(partial)); + syslog(LOG_DEBUG, "imap: selected partial is <%s>", ChrPtr(partial)); } - if (IMAP->cached_body == NULL) { + if (Imap->cached_body == NULL) { CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ); loading_body_now = 1; - msg = CtdlFetchMessage(msgnum, (need_body ? 1 : 0)); + msg = CtdlFetchMessage(msgnum, (need_body ? 1 : 0), 1); } /* Now figure out what the client wants, and get it */ @@ -706,41 +729,45 @@ void imap_fetch_body(long msgnum, ConstStr item, int is_peek) { * (Note value of 1 passed as 'dont_decode' so client gets it encoded) */ else { - mime_parser(msg->cm_fields['M'], NULL, - *imap_load_part, NULL, NULL, - ChrPtr(section), - 1 - ); + mime_parser(CM_RANGE(msg, eMesageText), + *imap_load_part, NULL, NULL, + section, + 1 + ); } if (loading_body_now) { - IMAP->cached_body_len = StrLength(CCC->redirect_buffer); - IMAP->cached_body = SmashStrBuf(&CCC->redirect_buffer); - IMAP->cached_bodymsgnum = msgnum; - IMAP->cached_body_withbody = need_body; - strcpy(IMAP->cached_bodypart, ChrPtr(section)); + Imap->cached_body_len = StrLength(CCC->redirect_buffer); + Imap->cached_body = SmashStrBuf(&CCC->redirect_buffer); + Imap->cached_bodymsgnum = msgnum; + Imap->cached_body_withbody = need_body; + strcpy(Imap->cached_bodypart, ChrPtr(section)); } if (is_partial == 0) { - cprintf("BODY[%s] {" SIZE_T_FMT "}\r\n", ChrPtr(section), IMAP->cached_body_len); + IAPuts("BODY["); + iaputs(SKEY(section)); + IAPrintf("] {" SIZE_T_FMT "}\r\n", Imap->cached_body_len); pstart = 0; - pbytes = IMAP->cached_body_len; + pbytes = Imap->cached_body_len; } else { sscanf(ChrPtr(partial), SIZE_T_FMT "." SIZE_T_FMT, &pstart, &pbytes); - if (pbytes > (IMAP->cached_body_len - pstart)) { - pbytes = IMAP->cached_body_len - pstart; + if (pbytes > (Imap->cached_body_len - pstart)) { + pbytes = Imap->cached_body_len - pstart; } - cprintf("BODY[%s]<" SIZE_T_FMT "> {" SIZE_T_FMT "}\r\n", ChrPtr(section), pstart, pbytes); + IAPuts("BODY["); + iaputs(SKEY(section)); + IAPrintf("]<" SIZE_T_FMT "> {" SIZE_T_FMT "}\r\n", pstart, pbytes); } FreeStrBuf(&partial); /* Here we go -- output it */ - client_write(&IMAP->cached_body[pstart], pbytes); + iaputs(&Imap->cached_body[pstart], pbytes); if (msg != NULL) { - CtdlFreeMessage(msg); + CM_Free(msg); } /* Mark this message as "seen" *unless* this is a "peek" operation */ @@ -759,7 +786,7 @@ void imap_fetch_bodystructure_pre( char *cbid, void *cbuserdata ) { - cprintf("("); + IAPuts("("); } @@ -772,19 +799,19 @@ void imap_fetch_bodystructure_post( void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, char *cbid, void *cbuserdata ) { - + long len; char subtype[128]; - cprintf(" "); + IAPuts(" "); /* disposition */ - extract_token(subtype, cbtype, 1, '/', sizeof subtype); - plain_imap_strout(subtype); + len = extract_token(subtype, cbtype, 1, '/', sizeof subtype); + IPutStr(subtype, len); /* body language */ - /* cprintf(" NIL"); We thought we needed this at one point, but maybe we don't... */ + /* IAPuts(" NIL"); We thought we needed this at one point, but maybe we don't... */ - cprintf(")"); + IAPuts(")"); } @@ -805,61 +832,62 @@ void imap_fetch_bodystructure_part( size_t i; char cbmaintype[128]; char cbsubtype[128]; + long cbmaintype_len; + long cbsubtype_len; if (cbtype != NULL) if (!IsEmptyStr(cbtype)) have_cbtype = 1; if (have_cbtype) { - extract_token(cbmaintype, cbtype, 0, '/', sizeof cbmaintype); - extract_token(cbsubtype, cbtype, 1, '/', sizeof cbsubtype); + cbmaintype_len = extract_token(cbmaintype, cbtype, 0, '/', sizeof cbmaintype); + cbsubtype_len = extract_token(cbsubtype, cbtype, 1, '/', sizeof cbsubtype); } else { strcpy(cbmaintype, "TEXT"); + cbmaintype_len = 4; strcpy(cbsubtype, "PLAIN"); + cbsubtype_len = 5; } - cprintf("("); - plain_imap_strout(cbmaintype); /* body type */ - cprintf(" "); - plain_imap_strout(cbsubtype); /* body subtype */ - cprintf(" "); + IAPuts("("); + IPutStr(cbmaintype, cbmaintype_len); /* body type */ + IAPuts(" "); + IPutStr(cbsubtype, cbsubtype_len); /* body subtype */ + IAPuts(" "); - cprintf("("); /* begin body parameter list */ + IAPuts("("); /* begin body parameter list */ /* "NAME" must appear as the first parameter. This is not required by IMAP, * but the Asterisk voicemail application blindly assumes that NAME will be in * the first position. If it isn't, it rejects the message. */ - if (name != NULL) if (!IsEmptyStr(name)) { - cprintf("\"NAME\" "); - plain_imap_strout(name); - cprintf(" "); + if ((name != NULL) && (!IsEmptyStr(name))) { + IAPuts("\"NAME\" "); + IPutStr(name, strlen(name)); + IAPuts(" "); } - cprintf("\"CHARSET\" "); - if (cbcharset == NULL) { - plain_imap_strout("US-ASCII"); - } - else if (cbcharset[0] == 0) { - plain_imap_strout("US-ASCII"); + IAPuts("\"CHARSET\" "); + if ((cbcharset == NULL) || (cbcharset[0] == 0)){ + IPutStr(HKEY("US-ASCII")); } else { - plain_imap_strout(cbcharset); + IPutStr(cbcharset, strlen(cbcharset)); } - cprintf(") "); /* end body parameter list */ + IAPuts(") "); /* end body parameter list */ - cprintf("NIL "); /* Body ID */ - cprintf("NIL "); /* Body description */ + IAPuts("NIL "); /* Body ID */ + IAPuts("NIL "); /* Body description */ - if (encoding != NULL) if (encoding[0] != 0) have_encoding = 1; + if ((encoding != NULL) && (encoding[0] != 0)) have_encoding = 1; if (have_encoding) { - plain_imap_strout(encoding); + IPutStr(encoding, strlen(encoding)); } else { - plain_imap_strout("7BIT"); + IPutStr(HKEY("7BIT")); } - cprintf(" "); + IAPuts(" "); /* The next field is the size of the part in bytes. */ - cprintf("%ld ", (long)length); /* bytes */ + IAPrintf("%ld ", (long)length); /* bytes */ /* The next field is the number of lines in the part, if and only * if the part is TEXT. More gratuitous complexity. @@ -868,7 +896,7 @@ void imap_fetch_bodystructure_part( if (length) for (i=0; icm_fields['M'], - NULL, - *imap_fetch_bodystructure_part, /* part */ - *imap_fetch_bodystructure_pre, /* pre-multi */ - *imap_fetch_bodystructure_post, /* post-multi */ - NULL, - 1); /* don't decode -- we want it as-is */ + IAPuts("BODYSTRUCTURE "); + mime_parser(CM_RANGE(msg, eMesageText), + *imap_fetch_bodystructure_part, /* part */ + *imap_fetch_bodystructure_pre, /* pre-multi */ + *imap_fetch_bodystructure_post, /* post-multi */ + NULL, + 1); /* don't decode -- we want it as-is */ } @@ -993,7 +1018,7 @@ void imap_do_fetch_msg(int seq, citimap_command *Cmd) { if (Imap->msgids[seq-1] < 1L) return; buffer_output(); - cprintf("* %d FETCH (", seq); + IAPrintf("* %d FETCH (", seq); for (i=0; inum_parms; ++i) { @@ -1033,11 +1058,11 @@ void imap_do_fetch_msg(int seq, citimap_command *Cmd) { */ else if (!strcasecmp(Cmd->Params[i].Key, "BODYSTRUCTURE")) { if ((msg != NULL) && (!body_loaded)) { - CtdlFreeMessage(msg); /* need the whole thing */ + CM_Free(msg); /* need the whole thing */ msg = NULL; } if (msg == NULL) { - msg = CtdlFetchMessage(Imap->msgids[seq-1], 1); + msg = CtdlFetchMessage(Imap->msgids[seq-1], 1, 1); body_loaded = 1; } imap_fetch_bodystructure(Imap->msgids[seq-1], @@ -1045,26 +1070,26 @@ void imap_do_fetch_msg(int seq, citimap_command *Cmd) { } else if (!strcasecmp(Cmd->Params[i].Key, "ENVELOPE")) { if (msg == NULL) { - msg = CtdlFetchMessage(Imap->msgids[seq-1], 0); + msg = CtdlFetchMessage(Imap->msgids[seq-1], 0, 1); body_loaded = 0; } imap_fetch_envelope(msg); } else if (!strcasecmp(Cmd->Params[i].Key, "INTERNALDATE")) { if (msg == NULL) { - msg = CtdlFetchMessage(Imap->msgids[seq-1], 0); + msg = CtdlFetchMessage(Imap->msgids[seq-1], 0, 1); body_loaded = 0; } imap_fetch_internaldate(msg); } - if (i != Cmd->num_parms-1) cprintf(" "); + if (i != Cmd->num_parms-1) IAPuts(" "); } - cprintf(")\r\n"); + IAPuts(")\r\n"); unbuffer_output(); if (msg != NULL) { - CtdlFreeMessage(msg); + CM_Free(msg); } } @@ -1075,30 +1100,30 @@ void imap_do_fetch_msg(int seq, citimap_command *Cmd) { * validated and boiled down the request a bit. */ void imap_do_fetch(citimap_command *Cmd) { + citimap *Imap = IMAP; int i; #if 0 /* debug output the parsed vector */ { int i; - CtdlLogPrintf(CTDL_DEBUG, "----- %ld params \n", - Cmd->num_parms); + syslog(LOG_DEBUG, "imap: ----- %ld params", Cmd->num_parms); for (i=0; i < Cmd->num_parms; i++) { if (Cmd->Params[i].len != strlen(Cmd->Params[i].Key)) - CtdlLogPrintf(CTDL_DEBUG, "*********** %ld != %ld : %s\n", - Cmd->Params[i].len, - strlen(Cmd->Params[i].Key), - Cmd->Params[i].Key); + syslog(LOG_DEBUG, "imap: *********** %ld != %ld : %s", + Cmd->Params[i].len, + strlen(Cmd->Params[i].Key), + Cmd->Params[i].Key); else - CtdlLogPrintf(CTDL_DEBUG, "%ld : %s\n", - Cmd->Params[i].len, - Cmd->Params[i].Key); + syslog(LOG_DEBUG, "imap: %ld : %s", + Cmd->Params[i].len, + Cmd->Params[i].Key); }} #endif - if (IMAP->num_msgs > 0) { - for (i = 0; i < IMAP->num_msgs; ++i) { + if (Imap->num_msgs > 0) { + for (i = 0; i < Imap->num_msgs; ++i) { /* Abort the fetch loop if the session breaks. * This is important for users who keep mailboxes @@ -1108,7 +1133,7 @@ void imap_do_fetch(citimap_command *Cmd) { if (CC->kill_me) return; /* Get any message marked for fetch. */ - if (IMAP->flags[i] & IMAP_SELECTED) { + if (Imap->flags[i] & IMAP_SELECTED) { imap_do_fetch_msg(i+1, Cmd); } } @@ -1206,7 +1231,6 @@ int imap_extract_data_items(citimap_command *Cmd) int nArgs; int nest = 0; const char *pch, *end; - long initial_len; /* Convert all whitespace to ordinary space characters. */ pch = ChrPtr(Cmd->CmdBuf); @@ -1241,7 +1265,6 @@ int imap_extract_data_items(citimap_command *Cmd) */ nArgs = StrLength(Cmd->CmdBuf) / 10 + 10; nArgs = CmdAdjust(Cmd, nArgs, 0); - initial_len = StrLength(Cmd->CmdBuf); Cmd->num_parms = 0; Cmd->Params[Cmd->num_parms].Key = pch = ChrPtr(Cmd->CmdBuf); end = Cmd->Params[Cmd->num_parms].Key + StrLength(Cmd->CmdBuf); @@ -1300,13 +1323,13 @@ int imap_extract_data_items(citimap_command *Cmd) * Set is_uid to 1 to fetch by UID instead of sequence number. */ void imap_pick_range(const char *supplied_range, int is_uid) { + citimap *Imap = IMAP; int i; int num_sets; int s; char setstr[SIZ], lostr[SIZ], histr[SIZ]; long lo, hi; char actual_range[SIZ]; - citimap *Imap; /* * Handle the "ALL" macro @@ -1318,7 +1341,6 @@ void imap_pick_range(const char *supplied_range, int is_uid) { safestrncpy(actual_range, supplied_range, sizeof actual_range); } - Imap = IMAP; /* * Clear out the IMAP_SELECTED flags for all messages. */ @@ -1371,7 +1393,7 @@ void imap_fetch(int num_parms, ConstStr *Params) { int num_items; if (num_parms < 4) { - cprintf("%s BAD invalid parameters\r\n", Params[0].Key); + IReply("BAD invalid parameters"); return; } @@ -1383,14 +1405,14 @@ void imap_fetch(int num_parms, ConstStr *Params) { num_items = imap_extract_data_items(&Cmd); if (num_items < 1) { - cprintf("%s BAD invalid data item list\r\n", Params[0].Key); + IReply("BAD invalid data item list"); FreeStrBuf(&Cmd.CmdBuf); free(Cmd.Params); return; } imap_do_fetch(&Cmd); - cprintf("%s OK FETCH completed\r\n", Params[0].Key); + IReply("OK FETCH completed"); FreeStrBuf(&Cmd.CmdBuf); free(Cmd.Params); } @@ -1405,7 +1427,7 @@ void imap_uidfetch(int num_parms, ConstStr *Params) { int have_uid_item = 0; if (num_parms < 5) { - cprintf("%s BAD invalid parameters\r\n", Params[0].Key); + IReply("BAD invalid parameters"); return; } @@ -1416,11 +1438,11 @@ void imap_uidfetch(int num_parms, ConstStr *Params) { MakeStringOf(Cmd.CmdBuf, 4); #if 0 - CtdlLogPrintf(CTDL_DEBUG, "-------%s--------\n", ChrPtr(Cmd.CmdBuf)); + syslog(LOG_DEBUG, "imap: -------%s--------", ChrPtr(Cmd.CmdBuf)); #endif num_items = imap_extract_data_items(&Cmd); if (num_items < 1) { - cprintf("%s BAD invalid data item list\r\n", Params[0].Key); + IReply("BAD invalid data item list"); FreeStrBuf(&Cmd.CmdBuf); free(Cmd.Params); return; @@ -1444,7 +1466,7 @@ void imap_uidfetch(int num_parms, ConstStr *Params) { } imap_do_fetch(&Cmd); - cprintf("%s OK UID FETCH completed\r\n", Params[0].Key); + IReply("OK UID FETCH completed"); FreeStrBuf(&Cmd.CmdBuf); free(Cmd.Params); }