* MSG4 (and CtdlOutputMsg() as well) now accepts an optional MIME part

[citadel.git] / citadel / imap_fetch.c

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index 5a37531b84c9a6ee78bcad0dad8315d5002fb5c3..0e55b1a0facd1e9239ab719afc1aec16e93ffd88 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -92,6 +92,7 @@ void imap_fetch_internaldate(struct CtdlMessage *msg) {
        char buf[SIZ];
        time_t msgdate;
 
+       if (!msg) return;
        if (msg->cm_fields['T'] != NULL) {
                msgdate = atol(msg->cm_fields['T']);
        }
@@ -115,7 +116,7 @@ void imap_fetch_internaldate(struct CtdlMessage *msg) {
  */
 void imap_fetch_rfc822(long msgnum, char *whichfmt) {
        char buf[SIZ];
-       char *ptr;
+       char *ptr = NULL;
        size_t headers_size, text_size, total_size;
        size_t bytes_to_send = 0;
        struct MetaData smi;
@@ -175,7 +176,7 @@ void imap_fetch_rfc822(long msgnum, char *whichfmt) {
                CC->redirect_alloc = SIZ;
                CtdlOutputMsg(msgnum, MT_RFC822,
                        (need_body ? HEADERS_ALL : HEADERS_ONLY),
-                       0, 1);
+                       0, 1, NULL);
                if (!need_body) cprintf("\r\n");        /* extra trailing newline */
                IMAP->cached_rfc822_data = CC->redirect_buffer;
                IMAP->cached_rfc822_len = CC->redirect_len;
@@ -258,7 +259,7 @@ void imap_fetch_rfc822(long msgnum, char *whichfmt) {
  * luxury of simply spewing without having to re-encode.
  */
 void imap_load_part(char *name, char *filename, char *partnum, char *disp,
-                   void *content, char *cbtype, size_t length, char *encoding,
+                   void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
                    void *cbuserdata)
 {
        char mbuf2[SIZ];
@@ -274,6 +275,8 @@ void imap_load_part(char *name, char *filename, char *partnum, char *disp,
 
        if (!strcasecmp(desired_section, mbuf2)) {
                cprintf("Content-type: %s", cbtype);
+               if (strlen(cbcharset) > 0)
+                       cprintf("; charset=\"%s\"", cbcharset);
                if (strlen(name) > 0)
                        cprintf("; name=\"%s\"", name);
                cprintf("\r\n");
@@ -302,6 +305,8 @@ void imap_load_part(char *name, char *filename, char *partnum, char *disp,
 void imap_output_envelope_from(struct CtdlMessage *msg) {
        char user[SIZ], node[SIZ], name[SIZ];
 
+       if (!msg) return;
+
        /* For anonymous messages, it's so easy! */
        if (!is_room_aide() && (msg->cm_anon_type == MES_ANONONLY)) {
                cprintf("((\"----\" NIL \"x\" \"x.org\")) ");
@@ -399,6 +404,8 @@ void imap_fetch_envelope(struct CtdlMessage *msg) {
        time_t msgdate;
        char *fieldptr = NULL;
 
+       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']);
@@ -450,10 +457,16 @@ void imap_fetch_envelope(struct CtdlMessage *msg) {
        /* To */
        imap_output_envelope_addr(msg->cm_fields['R']);
 
-       /* Cc */
-       fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Cc");
-       imap_output_envelope_addr(fieldptr);
-       if (fieldptr != NULL) free(fieldptr);
+       /* Cc (we do it this way because there might be a legacy non-Citadel Cc: field present) */
+       fieldptr = msg->cm_fields['Y'];
+       if (fieldptr != NULL) {
+               imap_output_envelope_addr(fieldptr);
+       }
+       else {
+               fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Cc");
+               imap_output_envelope_addr(fieldptr);
+               if (fieldptr != NULL) free(fieldptr);
+       }
 
        /* Bcc */
        fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Bcc");
@@ -564,13 +577,14 @@ void imap_fetch_body(long msgnum, char *item, int is_peek) {
        size_t pstart, pbytes;
        int loading_body_now = 0;
        int need_body = 1;
+       int burn_the_cache = 0;
 
        /* extract section */
        safestrncpy(section, item, sizeof section);
        if (strchr(section, '[') != NULL) {
                stripallbut(section, '[', ']');
        }
-       /* lprintf(CTDL_DEBUG, "Section is: %s%s\n", section, ((strlen(section)==0) ? "(empty)" : "") ); */
+       lprintf(CTDL_DEBUG, "Section is: %s%s\n", section, ((strlen(section)==0) ? "(empty)" : "") );
        if (!strncasecmp(section, "HEADER", 6)) {
                need_body = 0;
        }
@@ -579,9 +593,17 @@ void imap_fetch_body(long msgnum, char *item, int is_peek) {
         * same message again.
         */
        if (IMAP->cached_body != NULL) {
-               if ((IMAP->cached_bodymsgnum != msgnum)
-                  || ( (IMAP->cached_body_withbody) || (!need_body) )
-                  || (strcasecmp(IMAP->cached_bodypart, section)) ) {
+               if (IMAP->cached_bodymsgnum != msgnum) {
+                       burn_the_cache = 1;
+               }
+               else if ( (!IMAP->cached_body_withbody) && (need_body) ) {
+                       burn_the_cache = 1;
+               }
+               else if (strcasecmp(IMAP->cached_bodypart, 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;
@@ -614,11 +636,11 @@ void imap_fetch_body(long msgnum, char *item, int is_peek) {
        }
 
        else if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
-               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_NONE, 0, 1);
+               CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1);
        }
 
        else if (!strcmp(section, "")) {
-               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
+               CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1);
        }
 
        /*
@@ -626,7 +648,7 @@ void imap_fetch_body(long msgnum, char *item, int is_peek) {
         * fields, strip it down.
         */
        else if (!strncasecmp(section, "HEADER", 6)) {
-               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_ONLY, 0, 1);
+               CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ONLY, 0, 1);
                imap_strip_headers(section);
        }
 
@@ -634,7 +656,7 @@ void imap_fetch_body(long msgnum, char *item, int is_peek) {
         * Strip it down if the client asked for everything _except_ headers.
         */
        else if (!strncasecmp(section, "TEXT", 4)) {
-               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_NONE, 0, 1);
+               CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1);
        }
 
        /*
@@ -681,7 +703,7 @@ void imap_fetch_body(long msgnum, char *item, int is_peek) {
 
        /* Mark this message as "seen" *unless* this is a "peek" operation */
        if (is_peek == 0) {
-               CtdlSetSeen(msgnum, 1, ctdlsetseen_seen);
+               CtdlSetSeen(&msgnum, 1, 1, ctdlsetseen_seen, NULL, NULL);
        }
 }
 
@@ -690,7 +712,7 @@ void imap_fetch_body(long msgnum, char *item, int is_peek) {
  */
 void imap_fetch_bodystructure_pre(
                char *name, char *filename, char *partnum, char *disp,
-               void *content, char *cbtype, size_t length, char *encoding,
+               void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
                void *cbuserdata
                ) {
 
@@ -704,7 +726,7 @@ void imap_fetch_bodystructure_pre(
  */
 void imap_fetch_bodystructure_post(
                char *name, char *filename, char *partnum, char *disp,
-               void *content, char *cbtype, size_t length, char *encoding,
+               void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
                void *cbuserdata
                ) {
 
@@ -730,7 +752,7 @@ void imap_fetch_bodystructure_post(
  */
 void imap_fetch_bodystructure_part(
                char *name, char *filename, char *partnum, char *disp,
-               void *content, char *cbtype, size_t length, char *encoding,
+               void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
                void *cbuserdata
                ) {
 
@@ -757,7 +779,16 @@ void imap_fetch_bodystructure_part(
        imap_strout(cbsubtype);
        cprintf(" ");
 
-       cprintf("(\"CHARSET\" \"US-ASCII\"");
+       if (cbcharset == NULL) {
+               cprintf("(\"CHARSET\" \"US-ASCII\"");
+       }
+       else if (strlen(cbcharset) == 0) {
+               cprintf("(\"CHARSET\" \"US-ASCII\"");
+       }
+       else {
+               cprintf("(\"CHARSET\" ");
+               imap_strout(cbcharset);
+       }
 
        if (name != NULL) if (strlen(name)>0) {
                cprintf(" \"NAME\" ");
@@ -856,7 +887,7 @@ void imap_fetch_bodystructure (long msgnum, char *item,
                CC->redirect_buffer = malloc(SIZ);
                CC->redirect_len = 0;
                CC->redirect_alloc = SIZ;
-               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+               CtdlOutputPreLoadedMsg(msg, MT_RFC822, 0, 0, 1);
                rfc822 = CC->redirect_buffer;
                rfc822_len = CC->redirect_len;
                CC->redirect_buffer = NULL;
@@ -903,6 +934,11 @@ void imap_do_fetch_msg(int seq, int num_items, char **itemlist) {
        struct CtdlMessage *msg = NULL;
        int body_loaded = 0;
 
+       /* Don't attempt to fetch bogus messages or UID's */
+       if (seq < 1) return;
+       if (IMAP->msgids[seq-1] < 1L) return;
+
+       buffer_output();
        cprintf("* %d FETCH (", seq);
 
        for (i=0; i<num_items; ++i) {
@@ -972,6 +1008,7 @@ void imap_do_fetch_msg(int seq, int num_items, char **itemlist) {
        }
 
        cprintf(")\r\n");
+       unbuffer_output();
        if (msg != NULL) {
                CtdlFreeMessage(msg);
        }