* "RFC822.TEXT" body only (without leading blank line)
*/
void imap_fetch_rfc822(long msgnum, const char *whichfmt) {
- CitContext *CCC = CC;
- citimap *Imap = CCCIMAP;
+ citimap *Imap = IMAP;
const char *ptr = NULL;
size_t headers_size, text_size, total_size;
size_t bytes_to_send = 0;
/*
* Load the message into memory for translation & measurement
*/
- CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
CtdlOutputMsg(msgnum, MT_RFC822,
(need_body ? HEADERS_ALL : HEADERS_FAST),
0, 1, NULL, SUPPRESS_ENV_TO, NULL, NULL, NULL
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 = CC->redirect_buffer;
+ CC->redirect_buffer = NULL;
Imap->cached_rfc822_msgnum = msgnum;
Imap->cached_rfc822_withbody = need_body;
if ( (need_to_rewrite_metadata) &&
imap_output_envelope_from(msg);
/* Sender (default to same as 'From' if not present) */
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Sender");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Sender");
if (fieldptr != NULL) {
imap_output_envelope_addr(fieldptr);
free(fieldptr);
}
/* Reply-to */
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Reply-to");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Reply-to");
if (fieldptr != NULL) {
imap_output_envelope_addr(fieldptr);
free(fieldptr);
imap_output_envelope_addr(fieldptr);
}
else {
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Cc");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Cc");
imap_output_envelope_addr(fieldptr);
if (fieldptr != NULL) free(fieldptr);
}
/* Bcc */
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "Bcc");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "Bcc");
imap_output_envelope_addr(fieldptr);
if (fieldptr != NULL) free(fieldptr);
/* In-reply-to */
- fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "In-reply-to");
+ fieldptr = rfc822_fetch_field(msg->cm_fields[eMessageText], "In-reply-to");
IPutStr(fieldptr, (fieldptr)?strlen(fieldptr):0);
IAPuts(" ");
if (fieldptr != NULL) free(fieldptr);
int ok = 0;
int done_headers = 0;
const char *Ptr = NULL;
- CitContext *CCC = CC;
- if (CCC->redirect_buffer == NULL) return;
+ if (CC->redirect_buffer == NULL) return;
which_fields = NewStrBufDup(section);
Cmd.CmdBuf = which_fields;
num_parms = imap_parameterize(&Cmd);
- boiled_headers = NewStrBufPlain(NULL, StrLength(CCC->redirect_buffer));
+ boiled_headers = NewStrBufPlain(NULL, StrLength(CC->redirect_buffer));
Line = NewStrBufPlain(NULL, SIZ);
Ptr = NULL;
ok = 0;
do {
- StrBufSipLine(Line, CCC->redirect_buffer, &Ptr);
+ StrBufSipLine(Line, CC->redirect_buffer, &Ptr);
if (!isspace(ChrPtr(Line)[0])) {
StrBufAppendBufPlain(boiled_headers, HKEY("\r\n"), 0);
/* Now save it back (it'll always be smaller) */
- FreeStrBuf(&CCC->redirect_buffer);
- CCC->redirect_buffer = boiled_headers;
+ FreeStrBuf(&CC->redirect_buffer);
+ CC->redirect_buffer = boiled_headers;
free(Cmd.Params);
FreeStrBuf(&which_fields);
int loading_body_now = 0;
int need_body = 1;
int burn_the_cache = 0;
- CitContext *CCC = CC;
- citimap *Imap = CCCIMAP;
+ citimap *Imap = IMAP;
/* extract section */
section = NewStrBufPlain(CKEY(item));
}
if (Imap->cached_body == NULL) {
- CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
loading_body_now = 1;
msg = CtdlFetchMessage(msgnum, (need_body ? 1 : 0));
}
* (Note value of 1 passed as 'dont_decode' so client gets it encoded)
*/
else {
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*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_body_len = StrLength(CC->redirect_buffer);
+ Imap->cached_body = SmashStrBuf(&CC->redirect_buffer);
Imap->cached_bodymsgnum = msgnum;
Imap->cached_body_withbody = need_body;
strcpy(Imap->cached_bodypart, ChrPtr(section));
/* For messages already stored in RFC822 format, we have to parse. */
IAPuts("BODYSTRUCTURE ");
- mime_parser(CM_RANGE(msg, eMesageText),
+ mime_parser(CM_RANGE(msg, eMessageText),
*imap_fetch_bodystructure_part, /* part */
*imap_fetch_bodystructure_pre, /* pre-multi */
*imap_fetch_bodystructure_post, /* post-multi */