#include <ctype.h>
#include <string.h>
#include <limits.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "sysdep_decls.h"
#include "policy.h"
#include "database.h"
#include "msgbase.h"
-#include "tools.h"
#include "internet_addressing.h"
-#include "mime_parser.h"
#include "serv_imap.h"
#include "imap_tools.h"
#include "imap_fetch.h"
#include "genstamp.h"
+#include "ctdl_module.h"
CC->redirect_alloc = SIZ;
CtdlOutputMsg(msgnum, MT_RFC822,
(need_body ? HEADERS_ALL : HEADERS_ONLY),
- 0, 1, NULL);
+ 0, 1, NULL, 0);
if (!need_body) cprintf("\r\n"); /* extra trailing newline */
IMAP->cached_rfc822_data = CC->redirect_buffer;
IMAP->cached_rfc822_len = CC->redirect_len;
ptr = memreadline(ptr, buf, sizeof buf);
if (*ptr != 0) {
striplt(buf);
- if (strlen(buf) == 0) {
+ if (IsEmptyStr(buf)) {
headers_size = ptr - IMAP->cached_rfc822_data;
}
}
text_size = 0;
}
- lprintf(CTDL_DEBUG, "RFC822: headers=%d, text=%d, total=%d\n",
+ CtdlLogPrintf(CTDL_DEBUG,
+ "RFC822: headers=" SIZE_T_FMT
+ ", text=" SIZE_T_FMT
+ ", total=" SIZE_T_FMT "\n",
headers_size, text_size, total_size);
if (!strcasecmp(whichfmt, "RFC822.SIZE")) {
- cprintf("RFC822.SIZE %d", total_size);
+ cprintf("RFC822.SIZE " SIZE_T_FMT, total_size);
return;
}
bytes_to_send = text_size;
}
- cprintf("%s {%d}\r\n", whichfmt, bytes_to_send);
+ cprintf("%s {" SIZE_T_FMT "}\r\n", whichfmt, bytes_to_send);
client_write(ptr, bytes_to_send);
}
if (!strcasecmp(desired_section, mbuf2)) {
cprintf("Content-type: %s", cbtype);
- if (strlen(cbcharset) > 0)
+ if (!IsEmptyStr(cbcharset))
cprintf("; charset=\"%s\"", cbcharset);
- if (strlen(name) > 0)
+ if (!IsEmptyStr(name))
cprintf("; name=\"%s\"", name);
cprintf("\r\n");
- if (strlen(encoding) > 0)
+ if (!IsEmptyStr(encoding))
cprintf("Content-Transfer-Encoding: %s\r\n", encoding);
- if (strlen(encoding) > 0) {
+ if (!IsEmptyStr(encoding)) {
cprintf("Content-Disposition: %s", disp);
- if (strlen(filename) > 0) {
+ if (!IsEmptyStr(filename)) {
cprintf("; filename=\"%s\"", filename);
}
cprintf("\r\n");
return;
}
- if (strlen(addr) == 0) {
+ if (IsEmptyStr(addr)) {
cprintf("NIL ");
return;
}
if (!strncasecmp(which_fields, "HEADER.FIELDS.NOT", 17))
headers_not = 1;
- for (i=0; i<strlen(which_fields); ++i) {
+ for (i=0; which_fields[i]; ++i) {
if (which_fields[i]=='(')
strcpy(which_fields, &which_fields[i+1]);
}
- for (i=0; i<strlen(which_fields); ++i) {
- if (which_fields[i]==')')
+ for (i=0; which_fields[i]; ++i) {
+ if (which_fields[i]==')') {
which_fields[i] = 0;
+ break;
+ }
}
num_parms = imap_parameterize(parms, which_fields);
strcat(boiled_headers, "\r\n");
}
- if (strlen(buf) == 0) done_headers = 1;
+ if (IsEmptyStr(buf)) done_headers = 1;
if (buf[0]=='\r') done_headers = 1;
if (buf[0]=='\n') done_headers = 1;
}
if (strchr(section, '[') != NULL) {
stripallbut(section, '[', ']');
}
- lprintf(CTDL_DEBUG, "Section is: %s%s\n", section, ((strlen(section)==0) ? "(empty)" : "") );
- if (!strncasecmp(section, "HEADER", 6)) {
- need_body = 0;
- }
+ CtdlLogPrintf(CTDL_DEBUG, "Section is: %s%s\n",
+ section,
+ IsEmptyStr(section) ? "(empty)" : "");
+
+ /*
+ * We used to have this great optimization in place that would avoid
+ * fetching the entire RFC822 message from disk if the client was only
+ * asking for the headers. Unfortunately, fetching only the Citadel
+ * headers omits "Content-type:" and this behavior breaks the iPhone
+ * email client. So we have to fetch the whole message from disk. The
+ *
+ * if (!strncasecmp(section, "HEADER", 6)) {
+ * need_body = 0;
+ * }
+ *
+ */
/* Burn the cache if we don't have the same section of the
* same message again.
is_partial = 1;
}
if (is_partial == 0) strcpy(partial, "");
- /* if (strlen(partial) > 0) lprintf(CTDL_DEBUG, "Partial is %s\n", partial); */
+ /* if (!IsEmptyStr(partial)) CtdlLogPrintf(CTDL_DEBUG, "Partial is %s\n", partial); */
if (IMAP->cached_body == NULL) {
CC->redirect_buffer = malloc(SIZ);
}
else if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1, 0);
}
else if (!strcmp(section, "")) {
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, 0);
}
/*
* fields, strip it down.
*/
else if (!strncasecmp(section, "HEADER", 6)) {
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ONLY, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ONLY, 0, 1, 0);
imap_strip_headers(section);
}
* Strip it down if the client asked for everything _except_ headers.
*/
else if (!strncasecmp(section, "TEXT", 4)) {
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1, 0);
}
/*
}
if (is_partial == 0) {
- cprintf("BODY[%s] {%d}\r\n", section, IMAP->cached_body_len);
+ cprintf("BODY[%s] {" SIZE_T_FMT "}\r\n", section, IMAP->cached_body_len);
pstart = 0;
pbytes = IMAP->cached_body_len;
}
else {
- sscanf(partial, "%d.%d", &pstart, &pbytes);
+ sscanf(partial, SIZE_T_FMT "." SIZE_T_FMT, &pstart, &pbytes);
if (pbytes > (IMAP->cached_body_len - pstart)) {
pbytes = IMAP->cached_body_len - pstart;
}
- cprintf("BODY[%s]<%d> {%d}\r\n", section, pstart, pbytes);
+ cprintf("BODY[%s]<" SIZE_T_FMT "> {" SIZE_T_FMT "}\r\n", section, pstart, pbytes);
}
/* Here we go -- output it */
imap_strout(subtype);
/* body language */
- cprintf(" NIL");
+ /* cprintf(" NIL"); We thought we needed this at one point, but maybe we don't... */
cprintf(")");
}
char cbmaintype[128];
char cbsubtype[128];
- if (cbtype != NULL) if (strlen(cbtype)>0) have_cbtype = 1;
+ 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);
}
cprintf("(");
- imap_strout(cbmaintype);
+ imap_strout(cbmaintype); /* body type */
cprintf(" ");
- imap_strout(cbsubtype);
+ imap_strout(cbsubtype); /* body subtype */
cprintf(" ");
+ cprintf("("); /* 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\" ");
+ imap_strout(name);
+ cprintf(" ");
+ }
+
+ cprintf("\"CHARSET\" ");
if (cbcharset == NULL) {
- cprintf("(\"CHARSET\" \"US-ASCII\"");
+ imap_strout("US-ASCII");
}
- else if (strlen(cbcharset) == 0) {
- cprintf("(\"CHARSET\" \"US-ASCII\"");
+ else if (cbcharset[0] == 0) {
+ imap_strout("US-ASCII");
}
else {
- cprintf("(\"CHARSET\" ");
imap_strout(cbcharset);
}
+ cprintf(") "); /* end body parameter list */
- if (name != NULL) if (strlen(name)>0) {
- cprintf(" \"NAME\" ");
- imap_strout(name);
- }
+ cprintf("NIL "); /* Body ID */
+ cprintf("NIL "); /* Body description */
- cprintf(") ");
-
- cprintf("NIL "); /* Body ID */
- cprintf("NIL "); /* Body description */
-
- if (encoding != NULL) if (strlen(encoding) > 0) have_encoding = 1;
+ if (encoding != NULL) if (encoding[0] != 0) have_encoding = 1;
if (have_encoding) {
imap_strout(encoding);
}
if (disp == NULL) {
cprintf("NIL");
}
- else if (strlen(disp) == 0) {
+ else if (IsEmptyStr(disp)) {
cprintf("NIL");
}
else {
cprintf("(");
imap_strout(disp);
- if (filename != NULL) if (strlen(filename)>0) {
+ if (filename != NULL) if (!IsEmptyStr(filename)) {
cprintf(" (\"FILENAME\" ");
imap_strout(filename);
cprintf(")");
CC->redirect_buffer = malloc(SIZ);
CC->redirect_len = 0;
CC->redirect_alloc = SIZ;
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, 0, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, 0, 0, 1, 0);
rfc822 = CC->redirect_buffer;
rfc822_len = CC->redirect_len;
CC->redirect_buffer = NULL;
ptr = rfc822;
while (ptr = memreadline(ptr, buf, sizeof buf), *ptr != 0) {
++lines;
- if ((strlen(buf) == 0) && (rfc822_body == NULL)) {
+ if ((IsEmptyStr(buf)) && (rfc822_body == NULL)) {
rfc822_body = ptr;
}
}
cprintf("BODYSTRUCTURE (\"TEXT\" \"PLAIN\" "
"(\"CHARSET\" \"US-ASCII\") NIL NIL "
- "\"7BIT\" %d %d)", rfc822_body_len, lines);
+ "\"7BIT\" " SIZE_T_FMT " %d)", rfc822_body_len, lines);
return;
}
*/
void imap_macro_replace(char *str, char *find, char *replace) {
char holdbuf[SIZ];
+ int findlen;
- if (!strncasecmp(str, find, strlen(find))) {
- if (str[strlen(find)]==' ') {
- strcpy(holdbuf, &str[strlen(find)+1]);
+ findlen = strlen(find);
+
+ if (!strncasecmp(str, find, findlen)) {
+ if (str[findlen]==' ') {
+ strcpy(holdbuf, &str[findlen+1]);
strcpy(str, replace);
strcat(str, " ");
strcat(str, holdbuf);
}
- if (str[strlen(find)]==0) {
- strcpy(holdbuf, &str[strlen(find)+1]);
+ if (str[findlen]==0) {
+ strcpy(holdbuf, &str[findlen+1]);
strcpy(str, replace);
}
}
int i;
int nest = 0;
- for (i=0; i<strlen(str); ++i) {
+ for (i=0; str[i]; ++i) {
if (str[i]=='(') ++nest;
if (str[i]=='[') ++nest;
if (str[i]=='<') ++nest;
int imap_extract_data_items(char **argv, char *items) {
int num_items = 0;
int nest = 0;
- int i, initial_len;
+ int i;
char *start;
+ long initial_len;
/* Convert all whitespace to ordinary space characters. */
- for (i=0; i<strlen(items); ++i) {
+ for (i=0; items[i]; ++i) {
if (isspace(items[i])) items[i]=' ';
}
char setstr[SIZ], lostr[SIZ], histr[SIZ];
long lo, hi;
char actual_range[SIZ];
+ struct citimap *Imap;
/*
* Handle the "ALL" macro
safestrncpy(actual_range, supplied_range, sizeof actual_range);
}
+ Imap = IMAP;
/*
* Clear out the IMAP_SELECTED flags for all messages.
*/
- for (i = 0; i < IMAP->num_msgs; ++i) {
- IMAP->flags[i] = IMAP->flags[i] & ~IMAP_SELECTED;
+ for (i = 0; i < Imap->num_msgs; ++i) {
+ Imap->flags[i] = Imap->flags[i] & ~IMAP_SELECTED;
}
/*
hi = atol(histr);
/* Loop through the array, flipping bits where appropriate */
- for (i = 1; i <= IMAP->num_msgs; ++i) {
+ for (i = 1; i <= Imap->num_msgs; ++i) {
if (is_uid) { /* fetch by sequence number */
- if ( (IMAP->msgids[i-1]>=lo)
- && (IMAP->msgids[i-1]<=hi)) {
- IMAP->flags[i-1] |= IMAP_SELECTED;
+ if ( (Imap->msgids[i-1]>=lo)
+ && (Imap->msgids[i-1]<=hi)) {
+ Imap->flags[i-1] |= IMAP_SELECTED;
}
}
else { /* fetch by uid */
if ( (i>=lo) && (i<=hi)) {
- IMAP->flags[i-1] |= IMAP_SELECTED;
+ Imap->flags[i-1] |= IMAP_SELECTED;
}
}
}
projects / citadel.git / blobdiff