* Individual field functions for imap_do_fetch_msg() ...
*/
-
-
void imap_fetch_uid(int seq) {
cprintf("UID %ld", IMAP->msgids[seq-1]);
}
cprintf("\\Answered");
++num_flags_printed;
}
+ if (IMAP->flags[seq] & IMAP_RECENT) {
+ if (num_flags_printed > 0) cprintf(" ");
+ cprintf("\\Recent");
+ ++num_flags_printed;
+ }
cprintf(")");
}
* "RFC822.SIZE" size of translated message
* "RFC822.TEXT" body only (without leading blank line)
*/
-void imap_fetch_rfc822(int msgnum, char *whichfmt, struct CtdlMessage *msg) {
- char buf[1024];
+void imap_fetch_rfc822(long msgnum, char *whichfmt) {
+ char buf[SIZ];
char *ptr;
long headers_size, text_size, total_size;
long bytes_remaining = 0;
long blocksize;
- FILE *tmp;
+ FILE *tmp = NULL;
- tmp = tmpfile();
- if (tmp == NULL) {
- lprintf(CTDL_CRIT, "Cannot open temp file: %s\n",
- strerror(errno));
- return;
+ /* Cache the most recent RFC822 FETCH because some clients like to
+ * fetch in pieces, and we don't want to have to go back to the
+ * message store for each piece.
+ */
+ if ((IMAP->cached_fetch != NULL) && (IMAP->cached_msgnum == msgnum)) {
+ /* Good to go! */
+ tmp = IMAP->cached_fetch;
+ }
+ else if (IMAP->cached_fetch != NULL) {
+ /* Some other message is cached -- free it */
+ fclose(IMAP->cached_fetch);
+ IMAP->cached_fetch == NULL;
+ IMAP->cached_msgnum = (-1);
}
- /*
- * Load the message into a temp file for translation
- * and measurement
+ /* At this point, we now can fetch and convert the message iff it's not
+ * the one we had cached.
*/
- CtdlRedirectOutput(tmp, -1);
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
- HEADERS_ALL, 0, 1);
- CtdlRedirectOutput(NULL, -1);
- if (!is_valid_message(msg)) {
- lprintf(CTDL_ERR, "WARNING: output clobbered the message!\n");
+ if (tmp == NULL) {
+ tmp = tmpfile();
+ if (tmp == NULL) {
+ lprintf(CTDL_CRIT, "Cannot open temp file: %s\n",
+ strerror(errno));
+ return;
+ }
+
+ /*
+ * Load the message into a temp file for translation
+ * and measurement
+ */
+ TRACE;
+ CtdlRedirectOutput(tmp, -1);
+ TRACE;
+ CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
+ TRACE;
+ CtdlRedirectOutput(NULL, -1);
+ TRACE;
+
+ IMAP->cached_fetch = tmp;
+ IMAP->cached_msgnum = msgnum;
}
/*
fseek(tmp, 0L, SEEK_END);
total_size = ftell(tmp);
text_size = total_size - headers_size;
+ lprintf(CTDL_DEBUG, "RFC822: headers=%ld, text=%ld, total=%ld\n",
+ headers_size, text_size, total_size);
if (!strcasecmp(whichfmt, "RFC822.SIZE")) {
cprintf("RFC822.SIZE %ld", total_size);
- fclose(tmp);
return;
}
}
cprintf("%s {%ld}\r\n", whichfmt, bytes_remaining);
- blocksize = sizeof(buf);
+ blocksize = (long)sizeof(buf);
while (bytes_remaining > 0L) {
if (blocksize > bytes_remaining) blocksize = bytes_remaining;
- fread(buf, blocksize, 1, tmp);
- client_write(buf, blocksize);
+ fread(buf, (size_t)blocksize, 1, tmp);
+ client_write(buf, (int)blocksize);
bytes_remaining = bytes_remaining - blocksize;
}
- fclose(tmp);
}
void *cbuserdata)
{
struct imap_fetch_part *imfp;
- char mbuf2[1024];
+ char mbuf2[SIZ];
imfp = (struct imap_fetch_part *)cbuserdata;
* really need to make this suck less.
*/
void imap_output_envelope_from(struct CtdlMessage *msg) {
- char user[1024], node[1024], name[1024];
+ char user[SIZ], node[SIZ], name[SIZ];
/* For anonymous messages, it's so easy! */
if (!is_room_aide() && (msg->cm_anon_type == MES_ANONONLY)) {
fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Sender");
if (fieldptr != NULL) {
imap_output_envelope_addr(fieldptr);
- phree(fieldptr);
+ free(fieldptr);
}
else {
imap_output_envelope_from(msg);
fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Reply-to");
if (fieldptr != NULL) {
imap_output_envelope_addr(fieldptr);
- phree(fieldptr);
+ free(fieldptr);
}
else {
imap_output_envelope_from(msg);
/* Cc */
fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Cc");
imap_output_envelope_addr(fieldptr);
- if (fieldptr != NULL) phree(fieldptr);
+ if (fieldptr != NULL) free(fieldptr);
/* Bcc */
fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Bcc");
imap_output_envelope_addr(fieldptr);
- if (fieldptr != NULL) phree(fieldptr);
+ if (fieldptr != NULL) free(fieldptr);
/* In-reply-to */
fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "In-reply-to");
imap_strout(fieldptr);
cprintf(" ");
- if (fieldptr != NULL) phree(fieldptr);
+ if (fieldptr != NULL) free(fieldptr);
/* message ID */
imap_strout(msg->cm_fields['I']);
* then boil it down to just the fields we want.
*/
void imap_strip_headers(FILE *fp, char *section) {
- char buf[1024];
+ char buf[SIZ];
char *which_fields = NULL;
int doing_headers = 0;
int headers_not = 0;
int ok = 0;
int done_headers = 0;
- which_fields = strdoop(section);
+ which_fields = strdup(section);
if (!strncasecmp(which_fields, "HEADER.FIELDS", 13))
doing_headers = 1;
num_parms = imap_parameterize(parms, which_fields);
fseek(fp, 0L, SEEK_END);
- boiled_headers = mallok((size_t)(ftell(fp) + 256L));
+ boiled_headers = malloc((size_t)(ftell(fp) + 256L));
strcpy(boiled_headers, "");
rewind(fp);
ftruncate(fileno(fp), ftell(fp));
fflush(fp);
rewind(fp);
- phree(which_fields);
- phree(boiled_headers);
+ free(which_fields);
+ free(boiled_headers);
}
/*
* Implements the BODY and BODY.PEEK fetch items
*/
-void imap_fetch_body(long msgnum, char *item, int is_peek,
- struct CtdlMessage *msg) {
- char section[1024];
- char partial[1024];
+void imap_fetch_body(long msgnum, char *item, int is_peek) {
+ struct CtdlMessage *msg = NULL;
+ char section[SIZ];
+ char partial[SIZ];
int is_partial = 0;
- char buf[1024];
- int i;
- FILE *tmp;
+ char buf[SIZ];
+ FILE *tmp = NULL;
long bytes_remaining = 0;
long blocksize;
long pstart, pbytes;
struct imap_fetch_part imfp;
/* extract section */
- strcpy(section, item);
- for (i=0; i<strlen(section); ++i) {
- if (section[i]=='[') strcpy(section, §ion[i+1]);
+ safestrncpy(section, item, sizeof section);
+ if (strchr(section, '[') != NULL) {
+ stripallbut(section, '[', ']');
}
- for (i=0; i<strlen(section); ++i) {
- if (section[i]==']') section[i] = 0;
- }
- lprintf(CTDL_DEBUG, "Section is %s\n", section);
+ lprintf(CTDL_DEBUG, "Section is: %s%s\n", section, ((strlen(section)==0) ? "(empty)" : "") );
- /* extract partial */
- strcpy(partial, item);
- for (i=0; i<strlen(partial); ++i) {
- if (partial[i]=='<') {
- strcpy(partial, &partial[i+1]);
- is_partial = 1;
+ /* 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)
+ || (strcasecmp(IMAP->cached_bodypart, section)) ) {
+ fclose(IMAP->cached_body);
+ IMAP->cached_body = NULL;
+ IMAP->cached_bodymsgnum = (-1);
+ strcpy(IMAP->cached_bodypart, "");
}
}
- for (i=0; i<strlen(partial); ++i) {
- if (partial[i]=='>') partial[i] = 0;
+
+ /* extract partial */
+ safestrncpy(partial, item, sizeof partial);
+ if (strchr(partial, '<') != NULL) {
+ stripallbut(partial, '<', '>');
+ is_partial = 1;
}
if (is_partial == 0) strcpy(partial, "");
if (strlen(partial) > 0) lprintf(CTDL_DEBUG, "Partial is %s\n", partial);
- tmp = tmpfile();
- if (tmp == NULL) {
- lprintf(CTDL_CRIT, "Cannot open temp file: %s\n", strerror(errno));
- return;
+ if (IMAP->cached_body == NULL) {
+ tmp = tmpfile();
+ if (tmp == NULL) {
+ lprintf(CTDL_CRIT, "Cannot open temp file: %s\n", strerror(errno));
+ return;
+ }
+ msg = CtdlFetchMessage(msgnum, 1);
+TRACE;
}
/* Now figure out what the client wants, and get it */
+TRACE;
- if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
+ if (IMAP->cached_body != NULL) {
+ tmp = IMAP->cached_body;
+TRACE;
+ }
+ else if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
+TRACE;
CtdlRedirectOutput(tmp, -1);
CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
HEADERS_NONE, 0, 1);
CtdlRedirectOutput(NULL, -1);
+TRACE;
}
else if (!strcmp(section, "")) {
+TRACE;
CtdlRedirectOutput(tmp, -1);
+TRACE;
+ lprintf(CTDL_DEBUG, "calling CtdlOutputPreLoadedMsg()\n");
+ lprintf(CTDL_DEBUG, "msg %s null\n", ((msg == NULL) ? "is" : "is not") );
+ lprintf(CTDL_DEBUG, "msgnum is %ld\n", msgnum);
CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
HEADERS_ALL, 0, 1);
+TRACE;
CtdlRedirectOutput(NULL, -1);
+TRACE;
}
/*
* fields, strip it down.
*/
else if (!strncasecmp(section, "HEADER", 6)) {
+TRACE;
CtdlRedirectOutput(tmp, -1);
+TRACE;
+ lprintf(CTDL_DEBUG, "calling CtdlOutputPreLoadedMsg()\n");
+ lprintf(CTDL_DEBUG, "msg %s null\n", ((msg == NULL) ? "is" : "is not") );
+ lprintf(CTDL_DEBUG, "msgnum is %ld\n", msgnum);
CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
HEADERS_ONLY, 0, 1);
+TRACE;
CtdlRedirectOutput(NULL, -1);
imap_strip_headers(tmp, section);
}
*/
else if (!strncasecmp(section, "TEXT", 4)) {
CtdlRedirectOutput(tmp, -1);
+ lprintf(CTDL_DEBUG, "calling CtdlOutputPreLoadedMsg()\n");
+ lprintf(CTDL_DEBUG, "msg %s null\n", ((msg == NULL) ? "is" : "is not") );
+ lprintf(CTDL_DEBUG, "msgnum is %ld\n", msgnum);
CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
HEADERS_NONE, 0, 1);
+TRACE;
CtdlRedirectOutput(NULL, -1);
+TRACE;
}
/*
* (Note value of 1 passed as 'dont_decode' so client gets it encoded)
*/
else {
+TRACE;
safestrncpy(imfp.desired_section, section,
sizeof(imfp.desired_section));
+TRACE;
imfp.output_fp = tmp;
+TRACE;
mime_parser(msg->cm_fields['M'], NULL,
*imap_load_part, NULL, NULL,
(void *)&imfp,
1);
+TRACE;
}
+TRACE;
fseek(tmp, 0L, SEEK_END);
+TRACE;
bytes_remaining = ftell(tmp);
+TRACE;
if (is_partial == 0) {
+TRACE;
rewind(tmp);
cprintf("BODY[%s] {%ld}\r\n", section, bytes_remaining);
+TRACE;
}
else {
+TRACE;
sscanf(partial, "%ld.%ld", &pstart, &pbytes);
if ((bytes_remaining - pstart) < pbytes) {
pbytes = bytes_remaining - pstart;
}
+TRACE;
fseek(tmp, pstart, SEEK_SET);
+TRACE;
bytes_remaining = pbytes;
+TRACE;
cprintf("BODY[%s]<%ld> {%ld}\r\n",
section, pstart, bytes_remaining);
}
+TRACE;
- blocksize = sizeof(buf);
+ blocksize = (long)sizeof(buf);
+TRACE;
while (bytes_remaining > 0L) {
+TRACE;
if (blocksize > bytes_remaining) blocksize = bytes_remaining;
+TRACE;
fread(buf, blocksize, 1, tmp);
- client_write(buf, blocksize);
+TRACE;
+ client_write(buf, (int)blocksize);
+TRACE;
bytes_remaining = bytes_remaining - blocksize;
+TRACE;
}
- fclose(tmp);
+TRACE;
+ /* Don't close it ... cache it! */
+ /* fclose(tmp); */
+TRACE;
+ IMAP->cached_body = tmp;
+ IMAP->cached_bodymsgnum = msgnum;
+ strcpy(IMAP->cached_bodypart, section);
+TRACE;
+
+ if (msg != NULL) {
+TRACE;
+ CtdlFreeMessage(msg);
+ }
/* Mark this message as "seen" *unless* this is a "peek" operation */
+TRACE;
if (is_peek == 0) {
CtdlSetSeen(msgnum, 1, ctdlsetseen_seen);
}
+TRACE;
}
/*
void imap_fetch_bodystructure (long msgnum, char *item,
struct CtdlMessage *msg) {
FILE *tmp;
- char buf[1024];
+ char buf[SIZ];
long lines = 0L;
long start_of_body = 0L;
long body_bytes = 0L;
}
-
-
-
-
/*
* imap_do_fetch() calls imap_do_fetch_msg() to output the data of an
- * individual message, once it has been successfully loaded from disk.
+ * individual message, once it has been selected for output.
*/
-void imap_do_fetch_msg(int seq, struct CtdlMessage *msg,
- int num_items, char **itemlist) {
+void imap_do_fetch_msg(int seq, int num_items, char **itemlist) {
int i;
+ struct CtdlMessage *msg = NULL;
+
+ lprintf(CTDL_DEBUG, "imap_do_fetch_msg(%d, %d)\n", seq, num_items);
+ for (i=0; i<num_items; ++i) {
+ lprintf(CTDL_DEBUG, " %s\n", itemlist[i]);
+ }
cprintf("* %d FETCH (", seq);
for (i=0; i<num_items; ++i) {
- if (!strncasecmp(itemlist[i], "BODY[", 5)) {
- imap_fetch_body(IMAP->msgids[seq-1], itemlist[i],
- 0, msg);
- }
- else if (!strncasecmp(itemlist[i], "BODY.PEEK[", 10)) {
- imap_fetch_body(IMAP->msgids[seq-1], itemlist[i],
- 1, msg);
- }
- else if (!strcasecmp(itemlist[i], "BODYSTRUCTURE")) {
- imap_fetch_bodystructure(IMAP->msgids[seq-1],
- itemlist[i], msg);
- }
- else if (!strcasecmp(itemlist[i], "ENVELOPE")) {
- imap_fetch_envelope(IMAP->msgids[seq-1], msg);
+ /* Fetchable without going to the message store at all */
+ if (!strcasecmp(itemlist[i], "UID")) {
+ imap_fetch_uid(seq);
}
else if (!strcasecmp(itemlist[i], "FLAGS")) {
imap_fetch_flags(seq-1);
}
- else if (!strcasecmp(itemlist[i], "INTERNALDATE")) {
- imap_fetch_internaldate(msg);
- }
+
+ /* Potentially fetchable from cache, if the client requests
+ * stuff from the same message several times in a row.
+ */
else if (!strcasecmp(itemlist[i], "RFC822")) {
- imap_fetch_rfc822(IMAP->msgids[seq-1], itemlist[i], msg);
+ imap_fetch_rfc822(IMAP->msgids[seq-1], itemlist[i]);
}
else if (!strcasecmp(itemlist[i], "RFC822.HEADER")) {
- imap_fetch_rfc822(IMAP->msgids[seq-1], itemlist[i], msg);
+ imap_fetch_rfc822(IMAP->msgids[seq-1], itemlist[i]);
}
else if (!strcasecmp(itemlist[i], "RFC822.SIZE")) {
- imap_fetch_rfc822(IMAP->msgids[seq-1], itemlist[i], msg);
+ imap_fetch_rfc822(IMAP->msgids[seq-1], itemlist[i]);
}
else if (!strcasecmp(itemlist[i], "RFC822.TEXT")) {
- imap_fetch_rfc822(IMAP->msgids[seq-1], itemlist[i], msg);
+ imap_fetch_rfc822(IMAP->msgids[seq-1], itemlist[i]);
}
- else if (!strcasecmp(itemlist[i], "UID")) {
- imap_fetch_uid(seq);
+
+ /* BODY fetches do their own fetching and caching too. */
+ else if (!strncasecmp(itemlist[i], "BODY[", 5)) {
+ imap_fetch_body(IMAP->msgids[seq-1], itemlist[i], 0);
+ }
+ else if (!strncasecmp(itemlist[i], "BODY.PEEK[", 10)) {
+ imap_fetch_body(IMAP->msgids[seq-1], itemlist[i], 1);
+ }
+
+ /* Otherwise, load the message into memory.
+ */
+ else if (!strcasecmp(itemlist[i], "BODYSTRUCTURE")) {
+ if (msg == NULL) msg = CtdlFetchMessage(IMAP->msgids[seq-1], 1);
+ imap_fetch_bodystructure(IMAP->msgids[seq-1],
+ itemlist[i], msg);
+ }
+ else if (!strcasecmp(itemlist[i], "ENVELOPE")) {
+ if (msg == NULL) msg = CtdlFetchMessage(IMAP->msgids[seq-1], 1);
+ imap_fetch_envelope(IMAP->msgids[seq-1], msg);
+ }
+ else if (!strcasecmp(itemlist[i], "INTERNALDATE")) {
+ if (msg == NULL) msg = CtdlFetchMessage(IMAP->msgids[seq-1], 1);
+ imap_fetch_internaldate(msg);
}
if (i != num_items-1) cprintf(" ");
}
cprintf(")\r\n");
+ if (msg != NULL) {
+ CtdlFreeMessage(msg);
+ }
}
*/
void imap_do_fetch(int num_items, char **itemlist) {
int i;
- struct CtdlMessage *msg;
-
- if (IMAP->num_msgs > 0)
- for (i = 0; i < IMAP->num_msgs; ++i)
- if (IMAP->flags[i] & IMAP_SELECTED) {
- msg = CtdlFetchMessage(IMAP->msgids[i]);
- if (msg != NULL) {
- imap_do_fetch_msg(i+1, msg, num_items, itemlist);
- CtdlFreeMessage(msg);
- }
- else {
- cprintf("* %d FETCH <internal error>\r\n", i+1);
+
+ if (IMAP->num_msgs > 0) {
+ for (i = 0; i < IMAP->num_msgs; ++i) {
+ if (IMAP->flags[i] & IMAP_SELECTED) {
+ imap_do_fetch_msg(i+1, num_items, itemlist);
+ }
}
}
}
* is not a generic search-and-replace function.
*/
void imap_macro_replace(char *str, char *find, char *replace) {
- char holdbuf[1024];
+ char holdbuf[SIZ];
if (!strncasecmp(str, find, strlen(find))) {
if (str[strlen(find)]==' ') {
int i;
int num_sets;
int s;
- char setstr[SIZ], lostr[SIZ], histr[SIZ]; /* was 1024 */
- int lo, hi;
+ char setstr[SIZ], lostr[SIZ], histr[SIZ];
+ long lo, hi;
char actual_range[SIZ];
/*
extract_token(lostr, setstr, 0, ':');
if (num_tokens(setstr, ':') >= 2) {
extract_token(histr, setstr, 1, ':');
- if (!strcmp(histr, "*")) snprintf(histr, sizeof histr, "%d", INT_MAX);
+ if (!strcmp(histr, "*")) snprintf(histr, sizeof histr, "%ld", LONG_MAX);
}
else {
strcpy(histr, lostr);
}
- lo = atoi(lostr);
- hi = atoi(histr);
+ lo = atol(lostr);
+ hi = atol(histr);
/* Loop through the array, flipping bits where appropriate */
for (i = 1; i <= IMAP->num_msgs; ++i) {
* This function is called by the main command loop.
*/
void imap_fetch(int num_parms, char *parms[]) {
- char items[SIZ]; /* was 1024 */
+ char items[SIZ];
char *itemlist[SIZ];
int num_items;
int i;
* This function is called by the main command loop.
*/
void imap_uidfetch(int num_parms, char *parms[]) {
- char items[SIZ]; /* was 1024 */
+ char items[SIZ];
char *itemlist[SIZ];
int num_items;
int i;
projects / citadel.git / blobdiff