-struct imap_fetch_part {
- char desired_section[SIZ];
- FILE *output_fp;
-};
-
/*
* Individual field functions for imap_do_fetch_msg() ...
*/
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 = NULL;
+ size_t headers_size, text_size, total_size;
+ size_t bytes_to_send = 0;
+ struct MetaData smi;
+ int need_to_rewrite_metadata = 0;
+ /* If this is an RFC822.SIZE fetch, first look in the message's
+ * metadata record to see if we've saved that information.
+ */
+ if (!strcasecmp(whichfmt, "RFC822.SIZE")) {
+ GetMetaData(&smi, msgnum);
+ if (smi.meta_rfc822_length > 0L) {
+ cprintf("RFC822.SIZE %ld", smi.meta_rfc822_length);
+ return;
+ }
+ need_to_rewrite_metadata = 1;
+ }
+
/* 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)) {
+ if ((IMAP->cached_rfc822_data != NULL)
+ && (IMAP->cached_rfc822_msgnum == msgnum)) {
/* Good to go! */
- tmp = IMAP->cached_fetch;
}
- else if (IMAP->cached_fetch != NULL) {
+ else if (IMAP->cached_rfc822_data != NULL) {
/* Some other message is cached -- free it */
- fclose(IMAP->cached_fetch);
- IMAP->cached_fetch == NULL;
- IMAP->cached_msgnum = (-1);
+ free(IMAP->cached_rfc822_data);
+ IMAP->cached_rfc822_data = NULL;
+ IMAP->cached_rfc822_msgnum = (-1);
+ IMAP->cached_rfc822_len = 0;
}
/* At this point, we now can fetch and convert the message iff it's not
* the one we had cached.
*/
- if (tmp == NULL) {
- tmp = tmpfile();
- if (tmp == NULL) {
- lprintf(CTDL_CRIT, "Cannot open temp file: %s\n",
- strerror(errno));
- return;
- }
-
+ if (IMAP->cached_rfc822_data == NULL) {
/*
- * Load the message into a temp file for translation
- * and measurement
+ * Load the message into memory for translation & measurement
*/
- CtdlRedirectOutput(tmp);
+ CC->redirect_buffer = malloc(SIZ);
+ CC->redirect_len = 0;
+ CC->redirect_alloc = SIZ;
CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
- CtdlRedirectOutput(NULL);
-
- IMAP->cached_fetch = tmp;
- IMAP->cached_msgnum = msgnum;
+ IMAP->cached_rfc822_data = CC->redirect_buffer;
+ IMAP->cached_rfc822_len = CC->redirect_len;
+ IMAP->cached_rfc822_msgnum = msgnum;
+ CC->redirect_buffer = NULL;
+ CC->redirect_len = 0;
+ CC->redirect_alloc = 0;
+ if (need_to_rewrite_metadata) {
+ smi.meta_rfc822_length = (long)IMAP->cached_rfc822_len;
+ PutMetaData(&smi);
+ }
}
/*
* Now figure out where the headers/text break is. IMAP considers the
* intervening blank line to be part of the headers, not the text.
*/
- rewind(tmp);
- headers_size = 0L;
+ headers_size = 0;
+ text_size = 0;
+ total_size = 0;
+
+ ptr = IMAP->cached_rfc822_data;
do {
- ptr = fgets(buf, sizeof buf, tmp);
- if (ptr != NULL) {
+ ptr = memreadline(ptr, buf, sizeof buf);
+ if (*ptr != 0) {
striplt(buf);
if (strlen(buf) == 0) {
- headers_size = ftell(tmp);
+ headers_size = ptr - IMAP->cached_rfc822_data;
}
}
- } while ( (headers_size == 0L) && (ptr != NULL) );
- fseek(tmp, 0L, SEEK_END);
- total_size = ftell(tmp);
+ } while ( (headers_size == 0) && (*ptr != 0) );
+
+ total_size = IMAP->cached_rfc822_len;
text_size = total_size - headers_size;
- /* lprintf(CTDL_DEBUG, "RFC822: headers=%ld, text=%ld, total=%ld\n",
- headers_size, text_size, total_size); */
+
+ lprintf(CTDL_DEBUG, "RFC822: headers=%d, text=%d, total=%d\n",
+ headers_size, text_size, total_size);
if (!strcasecmp(whichfmt, "RFC822.SIZE")) {
- cprintf("RFC822.SIZE %ld", total_size);
+ cprintf("RFC822.SIZE %d", total_size);
return;
}
else if (!strcasecmp(whichfmt, "RFC822")) {
- bytes_remaining = total_size;
- rewind(tmp);
+ ptr = IMAP->cached_rfc822_data;
+ bytes_to_send = total_size;
}
else if (!strcasecmp(whichfmt, "RFC822.HEADER")) {
- bytes_remaining = headers_size;
- rewind(tmp);
+ ptr = IMAP->cached_rfc822_data;
+ bytes_to_send = headers_size;
}
else if (!strcasecmp(whichfmt, "RFC822.TEXT")) {
- bytes_remaining = text_size;
- fseek(tmp, headers_size, SEEK_SET);
- }
-
- cprintf("%s {%ld}\r\n", whichfmt, bytes_remaining);
- blocksize = (long)sizeof(buf);
- while (bytes_remaining > 0L) {
- if (blocksize > bytes_remaining) blocksize = bytes_remaining;
- fread(buf, (size_t)blocksize, 1, tmp);
- client_write(buf, (int)blocksize);
- bytes_remaining = bytes_remaining - blocksize;
+ ptr = &IMAP->cached_rfc822_data[headers_size];
+ bytes_to_send = text_size;
}
+ cprintf("%s {%d}\r\n", whichfmt, bytes_to_send);
+ client_write(ptr, bytes_to_send);
}
void *content, char *cbtype, size_t length, char *encoding,
void *cbuserdata)
{
- struct imap_fetch_part *imfp;
char mbuf2[SIZ];
+ char *desired_section;
- imfp = (struct imap_fetch_part *)cbuserdata;
+ desired_section = (char *)cbuserdata;
- if (!strcasecmp(partnum, imfp->desired_section)) {
- fwrite(content, length, 1, imfp->output_fp);
+ if (!strcasecmp(partnum, desired_section)) {
+ client_write(content, length);
}
snprintf(mbuf2, sizeof mbuf2, "%s.MIME", partnum);
- if (!strcasecmp(imfp->desired_section, mbuf2)) {
- fprintf(imfp->output_fp, "Content-type: %s", cbtype);
+ if (!strcasecmp(desired_section, mbuf2)) {
+ cprintf("Content-type: %s", cbtype);
if (strlen(name) > 0)
- fprintf(imfp->output_fp, "; name=\"%s\"", name);
- fprintf(imfp->output_fp, "\r\n");
+ cprintf("; name=\"%s\"", name);
+ cprintf("\r\n");
if (strlen(encoding) > 0)
- fprintf(imfp->output_fp,
- "Content-Transfer-Encoding: %s\r\n", encoding);
+ cprintf("Content-Transfer-Encoding: %s\r\n", encoding);
if (strlen(encoding) > 0) {
- fprintf(imfp->output_fp, "Content-Disposition: %s",
- disp);
+ cprintf("Content-Disposition: %s", disp);
if (strlen(filename) > 0) {
- fprintf(imfp->output_fp, "; filename=\"%s\"",
- filename);
+ cprintf("; filename=\"%s\"", filename);
}
- fprintf(imfp->output_fp, "\r\n");
+ cprintf("\r\n");
}
- fprintf(imfp->output_fp, "Content-Length: %ld\r\n", (long)length);
- fprintf(imfp->output_fp, "\r\n");
+ cprintf("Content-Length: %ld\r\n", (long)length);
+ cprintf("\r\n");
}
* fields. But we can use it for "To" and possibly others.
*/
void imap_output_envelope_addr(char *addr) {
- char individual_addr[SIZ];
+ char individual_addr[256];
int num_addrs;
int i;
- char user[SIZ];
- char node[SIZ];
- char name[SIZ];
+ char user[256];
+ char node[256];
+ char name[256];
if (addr == NULL) {
cprintf("NIL ");
/* Output them one by one. */
for (i=0; i<num_addrs; ++i) {
- extract_token(individual_addr, addr, i, ',');
+ extract_token(individual_addr, addr, i, ',', sizeof individual_addr);
striplt(individual_addr);
process_rfc822_addr(individual_addr, user, node, name);
cprintf("(");
/*
- * Strip any non header information out of a chunk of RFC822 data on disk,
- * then boil it down to just the fields we want.
+ * 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
+ * headers down to *only* the ones we're interested in.
*/
-void imap_strip_headers(FILE *fp, char *section) {
+void imap_strip_headers(char *section) {
char buf[SIZ];
char *which_fields = NULL;
int doing_headers = 0;
char *boiled_headers = NULL;
int ok = 0;
int done_headers = 0;
+ char *ptr = NULL;
+
+ if (CC->redirect_buffer == NULL) return;
which_fields = strdup(section);
}
num_parms = imap_parameterize(parms, which_fields);
- fseek(fp, 0L, SEEK_END);
- boiled_headers = malloc((size_t)(ftell(fp) + 256L));
+ boiled_headers = malloc(CC->redirect_alloc);
strcpy(boiled_headers, "");
- rewind(fp);
+ ptr = CC->redirect_buffer;
ok = 0;
- while ( (done_headers == 0) && (fgets(buf, sizeof buf, fp) != NULL) ) {
+ while ( (done_headers == 0) && (ptr = memreadline(ptr, buf, sizeof buf), *ptr != 0) ) {
if (!isspace(buf[0])) {
ok = 0;
if (doing_headers == 0) ok = 1;
if (ok) {
strcat(boiled_headers, buf);
+ strcat(boiled_headers, "\r\n");
}
if (strlen(buf) == 0) done_headers = 1;
strcat(boiled_headers, "\r\n");
- /* Now write it back */
- rewind(fp);
- fwrite(boiled_headers, strlen(boiled_headers), 1, fp);
- fflush(fp);
- ftruncate(fileno(fp), ftell(fp));
- fflush(fp);
- rewind(fp);
+ /* Now save it back (it'll always be smaller) */
+ strcpy(CC->redirect_buffer, boiled_headers);
+ CC->redirect_len = strlen(boiled_headers);
+
free(which_fields);
free(boiled_headers);
}
char section[SIZ];
char partial[SIZ];
int is_partial = 0;
- char buf[SIZ];
- FILE *tmp = NULL;
- long bytes_remaining = 0;
- long blocksize;
- long pstart, pbytes;
- struct imap_fetch_part imfp;
+ size_t pstart, pbytes;
+ int loading_body_now = 0;
/* extract section */
safestrncpy(section, item, sizeof section);
if (IMAP->cached_body != NULL) {
if ((IMAP->cached_bodymsgnum != msgnum)
|| (strcasecmp(IMAP->cached_bodypart, section)) ) {
- fclose(IMAP->cached_body);
+ free(IMAP->cached_body);
+ IMAP->cached_body_len = 0;
IMAP->cached_body = NULL;
IMAP->cached_bodymsgnum = (-1);
strcpy(IMAP->cached_bodypart, "");
/* if (strlen(partial) > 0) lprintf(CTDL_DEBUG, "Partial is %s\n", partial); */
if (IMAP->cached_body == NULL) {
- tmp = tmpfile();
- if (tmp == NULL) {
- lprintf(CTDL_CRIT, "Cannot open temp file: %s\n", strerror(errno));
- return;
- }
+ CC->redirect_buffer = malloc(SIZ);
+ CC->redirect_len = 0;
+ CC->redirect_alloc = SIZ;
+ loading_body_now = 1;
msg = CtdlFetchMessage(msgnum, 1);
}
/* Now figure out what the client wants, and get it */
- if (IMAP->cached_body != NULL) {
- tmp = IMAP->cached_body;
+ if (!loading_body_now) {
+ /* What we want is already in memory */
}
+
else if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
- CtdlRedirectOutput(tmp);
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
- HEADERS_NONE, 0, 1);
- CtdlRedirectOutput(NULL);
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_NONE, 0, 1);
}
else if (!strcmp(section, "")) {
- CtdlRedirectOutput(tmp);
- /* 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);
- CtdlRedirectOutput(NULL);
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
}
/*
* fields, strip it down.
*/
else if (!strncasecmp(section, "HEADER", 6)) {
- CtdlRedirectOutput(tmp);
- /* 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);
- CtdlRedirectOutput(NULL);
- imap_strip_headers(tmp, section);
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_ONLY, 0, 1);
+ imap_strip_headers(section);
}
/*
* Strip it down if the client asked for everything _except_ headers.
*/
else if (!strncasecmp(section, "TEXT", 4)) {
- CtdlRedirectOutput(tmp);
- /* 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);
- CtdlRedirectOutput(NULL);
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_NONE, 0, 1);
}
/*
* (Note value of 1 passed as 'dont_decode' so client gets it encoded)
*/
else {
- safestrncpy(imfp.desired_section, section,
- sizeof(imfp.desired_section));
- imfp.output_fp = tmp;
-
mime_parser(msg->cm_fields['M'], NULL,
*imap_load_part, NULL, NULL,
- (void *)&imfp,
+ section,
1);
}
-
- fseek(tmp, 0L, SEEK_END);
- bytes_remaining = ftell(tmp);
+ if (loading_body_now) {
+ IMAP->cached_body = CC->redirect_buffer;
+ IMAP->cached_body_len = CC->redirect_len;
+ IMAP->cached_bodymsgnum = msgnum;
+ strcpy(IMAP->cached_bodypart, section);
+ CC->redirect_buffer = NULL;
+ CC->redirect_len = 0;
+ CC->redirect_alloc = 0;
+ }
if (is_partial == 0) {
- rewind(tmp);
- cprintf("BODY[%s] {%ld}\r\n", section, bytes_remaining);
+ cprintf("BODY[%s] {%d}\r\n", section, IMAP->cached_body_len);
+ pstart = 0;
+ pbytes = IMAP->cached_body_len;
}
else {
- sscanf(partial, "%ld.%ld", &pstart, &pbytes);
- if ((bytes_remaining - pstart) < pbytes) {
- pbytes = bytes_remaining - pstart;
+ sscanf(partial, "%d.%d", &pstart, &pbytes);
+ if (pbytes > (IMAP->cached_body_len - pstart)) {
+ pbytes = IMAP->cached_body_len - pstart;
}
- fseek(tmp, pstart, SEEK_SET);
- bytes_remaining = pbytes;
- cprintf("BODY[%s]<%ld> {%ld}\r\n",
- section, pstart, bytes_remaining);
- }
-
- blocksize = (long)sizeof(buf);
- while (bytes_remaining > 0L) {
- if (blocksize > bytes_remaining) blocksize = bytes_remaining;
- fread(buf, blocksize, 1, tmp);
- client_write(buf, (int)blocksize);
- bytes_remaining = bytes_remaining - blocksize;
+ cprintf("BODY[%s]<%d> {%d}\r\n", section, pstart, pbytes);
}
- /* Don't close it ... cache it! */
- /* fclose(tmp); */
- IMAP->cached_body = tmp;
- IMAP->cached_bodymsgnum = msgnum;
- strcpy(IMAP->cached_bodypart, section);
+ /* Here we go -- output it */
+ client_write(&IMAP->cached_body[pstart], pbytes);
if (msg != NULL) {
CtdlFreeMessage(msg);
void *cbuserdata
) {
- char subtype[SIZ];
+ char subtype[128];
cprintf(" ");
/* disposition */
- extract_token(subtype, cbtype, 1, '/');
+ extract_token(subtype, cbtype, 1, '/', sizeof subtype);
imap_strout(subtype);
/* body language */
int have_encoding = 0;
int lines = 0;
size_t i;
- char cbmaintype[SIZ];
- char cbsubtype[SIZ];
+ char cbmaintype[128];
+ char cbsubtype[128];
if (cbtype != NULL) if (strlen(cbtype)>0) have_cbtype = 1;
if (have_cbtype) {
- extract_token(cbmaintype, cbtype, 0, '/');
- extract_token(cbsubtype, cbtype, 1, '/');
+ extract_token(cbmaintype, cbtype, 0, '/', sizeof cbmaintype);
+ extract_token(cbsubtype, cbtype, 1, '/', sizeof cbsubtype);
}
else {
strcpy(cbmaintype, "TEXT");
*/
void imap_fetch_bodystructure (long msgnum, char *item,
struct CtdlMessage *msg) {
- FILE *tmp;
+ char *rfc822 = NULL;
+ char *rfc822_body = NULL;
+ size_t rfc822_len;
+ size_t rfc822_headers_len;
+ size_t rfc822_body_len;
+ char *ptr = NULL;
char buf[SIZ];
- long lines = 0L;
- long start_of_body = 0L;
- long body_bytes = 0L;
+ int lines = 0;
/* For non-RFC822 (ordinary Citadel) messages, this is short and
* sweet...
if (msg->cm_format_type != FMT_RFC822) {
/* *sigh* We have to RFC822-format the message just to be able
- * to measure it.
+ * to measure it. FIXME use smi cached fields if possible
*/
- tmp = tmpfile();
- if (tmp == NULL) return;
- CtdlRedirectOutput(tmp);
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
- CtdlRedirectOutput(NULL);
- rewind(tmp);
- while (fgets(buf, sizeof buf, tmp) != NULL) {
+ CC->redirect_buffer = malloc(SIZ);
+ CC->redirect_len = 0;
+ CC->redirect_alloc = SIZ;
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+ rfc822 = CC->redirect_buffer;
+ rfc822_len = CC->redirect_len;
+ CC->redirect_buffer = NULL;
+ CC->redirect_len = 0;
+ CC->redirect_alloc = 0;
+
+ ptr = rfc822;
+ while (ptr = memreadline(ptr, buf, sizeof buf), *ptr != 0) {
++lines;
- if ((!strcmp(buf, "\r\n")) && (start_of_body == 0L)) {
- start_of_body = ftell(tmp);
+ if ((strlen(buf) == 0) && (rfc822_body == NULL)) {
+ rfc822_body = ptr;
}
}
- body_bytes = ftell(tmp) - start_of_body;
- fclose(tmp);
+
+ rfc822_headers_len = rfc822_body - rfc822;
+ rfc822_body_len = rfc822_len - rfc822_headers_len;
+ free(rfc822);
cprintf("BODYSTRUCTURE (\"TEXT\" \"PLAIN\" "
"(\"CHARSET\" \"US-ASCII\") NIL NIL "
- "\"7BIT\" %ld %ld)", body_bytes, lines);
+ "\"7BIT\" %d %d)", rfc822_body_len, lines);
return;
}
*/
num_sets = num_tokens(actual_range, ',');
for (s=0; s<num_sets; ++s) {
- extract_token(setstr, actual_range, s, ',');
+ extract_token(setstr, actual_range, s, ',', sizeof setstr);
- extract_token(lostr, setstr, 0, ':');
+ extract_token(lostr, setstr, 0, ':', sizeof lostr);
if (num_tokens(setstr, ':') >= 2) {
- extract_token(histr, setstr, 1, ':');
+ extract_token(histr, setstr, 1, ':', sizeof histr);
if (!strcmp(histr, "*")) snprintf(histr, sizeof histr, "%ld", LONG_MAX);
}
else {
- strcpy(histr, lostr);
+ safestrncpy(histr, lostr, sizeof histr);
}
lo = atol(lostr);
hi = atol(histr);
projects / citadel.git / blobdiff