]> code.citadel.org Git - citadel.git/blobdiff - citadel/imap_fetch.c
* Minor and/or cosmetic changes made during x64 troubleshooting
[citadel.git] / citadel / imap_fetch.c
index f15a6bec0bcd6569efe936bb036b9dca2c8b62fc..86088b79c3865be51237f1bb725518e6347dd31d 100644 (file)
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
@@ -45,7 +55,7 @@
 
 
 struct imap_fetch_part {
-       char desired_section[256];
+       char desired_section[SIZ];
        FILE *output_fp;
 };
 
@@ -53,18 +63,38 @@ struct imap_fetch_part {
  * Individual field functions for imap_do_fetch_msg() ...
  */
 
-
-
 void imap_fetch_uid(int seq) {
        cprintf("UID %ld", IMAP->msgids[seq-1]);
 }
 
-void imap_fetch_flags(struct CtdlMessage *msg) {
-       cprintf("FLAGS ()");    /* FIXME do something here */
+void imap_fetch_flags(int seq) {
+       int num_flags_printed = 0;
+       cprintf("FLAGS (");
+       if (IMAP->flags[seq] & IMAP_DELETED) {
+               if (num_flags_printed > 0) cprintf(" ");
+               cprintf("\\Deleted");
+               ++num_flags_printed;
+       }
+       if (IMAP->flags[seq] & IMAP_SEEN) {
+               if (num_flags_printed > 0) cprintf(" ");
+               cprintf("\\Seen");
+               ++num_flags_printed;
+       }
+       if (IMAP->flags[seq] & IMAP_ANSWERED) {
+               if (num_flags_printed > 0) cprintf(" ");
+               cprintf("\\Answered");
+               ++num_flags_printed;
+       }
+       if (IMAP->flags[seq] & IMAP_RECENT) {
+               if (num_flags_printed > 0) cprintf(" ");
+               cprintf("\\Recent");
+               ++num_flags_printed;
+       }
+       cprintf(")");
 }
 
 void imap_fetch_internaldate(struct CtdlMessage *msg) {
-       char buf[256];
+       char buf[SIZ];
        time_t msgdate;
 
        if (msg->cm_fields['T'] != NULL) {
@@ -74,7 +104,7 @@ void imap_fetch_internaldate(struct CtdlMessage *msg) {
                msgdate = time(NULL);
        }
 
-       datestring(buf, msgdate, DATESTRING_IMAP);
+       datestring(buf, sizeof buf, msgdate, DATESTRING_IMAP);
        cprintf("INTERNALDATE \"%s\"", buf);
 }
 
@@ -88,26 +118,55 @@ void imap_fetch_internaldate(struct CtdlMessage *msg) {
  *     "RFC822.SIZE"   size of translated message
  *     "RFC822.TEXT"   body only (without leading blank line)
  */
-void imap_fetch_rfc822(int msgnum, char *whichfmt) {
-       FILE *tmp;
-       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 = NULL;
 
-       tmp = tmpfile();
-       if (tmp == NULL) {
-               lprintf(1, "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
-        */ 
-       CtdlRedirectOutput(tmp, -1);
-       CtdlOutputMsg(msgnum, MT_RFC822, 0, 0, 1);
-       CtdlRedirectOutput(NULL, -1);
+       /* 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;
+               }
+       
+               /*
+                * 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;
+       }
 
        /*
         * Now figure out where the headers/text break is.  IMAP considers the
@@ -119,16 +178,19 @@ void imap_fetch_rfc822(int msgnum, char *whichfmt) {
                ptr = fgets(buf, sizeof buf, tmp);
                if (ptr != NULL) {
                        striplt(buf);
-                       if (strlen(buf) == 0) headers_size = ftell(tmp);
+                       if (strlen(buf) == 0) {
+                               headers_size = ftell(tmp);
+                       }
                }
        } while ( (headers_size == 0L) && (ptr != NULL) );
        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;
        }
 
@@ -148,24 +210,23 @@ void imap_fetch_rfc822(int msgnum, char *whichfmt) {
        }
 
        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);
 }
 
 
 
 /*
  * Load a specific part of a message into the temp file to be output to a
- * client.  FIXME we can handle parts like "2" and "2.1" but we still have
- * to handle parts like "2.MIME" and "2.HEADER" (the latter maybe not ...
- * Mark Crispy's server doesn't seem to)
+ * client.  FIXME we can handle parts like "2" and "2.1" and even "2.MIME"
+ * but we still can't handle "2.HEADER" (which might not be a problem, because
+ * we currently don't have the ability to break out nested RFC822's anyway).
  *
  * Note: mime_parser() was called with dont_decode set to 1, so we have the
  * luxury of simply spewing without having to re-encode.
@@ -175,7 +236,7 @@ void imap_load_part(char *name, char *filename, char *partnum, char *disp,
                    void *cbuserdata)
 {
        struct imap_fetch_part *imfp;
-       char mbuf2[1024];
+       char mbuf2[SIZ];
 
        imfp = (struct imap_fetch_part *)cbuserdata;
 
@@ -183,7 +244,7 @@ void imap_load_part(char *name, char *filename, char *partnum, char *disp,
                fwrite(content, length, 1, imfp->output_fp);
        }
 
-       sprintf(mbuf2, "%s.MIME", partnum);
+       snprintf(mbuf2, sizeof mbuf2, "%s.MIME", partnum);
 
        if (!strcasecmp(imfp->desired_section, mbuf2)) {
                fprintf(imfp->output_fp, "Content-type: %s", cbtype);
@@ -202,7 +263,7 @@ void imap_load_part(char *name, char *filename, char *partnum, char *disp,
                        }
                        fprintf(imfp->output_fp, "\r\n");
                }
-               fprintf(imfp->output_fp, "Content-Length: %d\r\n", length);
+               fprintf(imfp->output_fp, "Content-Length: %ld\r\n", (long)length);
                fprintf(imfp->output_fp, "\r\n");
        }
                        
@@ -210,71 +271,380 @@ void imap_load_part(char *name, char *filename, char *partnum, char *disp,
 }
 
 
+/* 
+ * Called by imap_fetch_envelope() to output the "From" field.
+ * This is in its own function because its logic is kind of complex.  We
+ * really need to make this suck less.
+ */
+void imap_output_envelope_from(struct CtdlMessage *msg) {
+       char user[SIZ], node[SIZ], name[SIZ];
 
+       /* For anonymous messages, it's so easy! */
+       if (!is_room_aide() && (msg->cm_anon_type == MES_ANONONLY)) {
+               cprintf("((\"----\" NIL \"x\" \"x.org\")) ");
+               return;
+       }
+       if (!is_room_aide() && (msg->cm_anon_type == MES_ANONOPT)) {
+               cprintf("((\"anonymous\" NIL \"x\" \"x.org\")) ");
+               return;
+       }
+
+       /* For everything else, we do stuff. */
+       cprintf("((");                          /* open double-parens */
+       imap_strout(msg->cm_fields['A']);       /* personal name */
+       cprintf(" NIL ");                       /* source route (not used) */
+
+
+       if (msg->cm_fields['F'] != NULL) {
+               process_rfc822_addr(msg->cm_fields['F'], user, node, name);
+               imap_strout(user);              /* mailbox name (user id) */
+               cprintf(" ");
+               if (!strcasecmp(node, config.c_nodename)) {
+                       imap_strout(config.c_fqdn);
+               }
+               else {
+                       imap_strout(node);              /* host name */
+               }
+       }
+       else {
+               imap_strout(msg->cm_fields['A']); /* mailbox name (user id) */
+               cprintf(" ");
+               imap_strout(msg->cm_fields['N']);       /* host name */
+       }
+       
+       cprintf(")) ");                         /* close double-parens */
+}
+
+
+
+/*
+ * Output an envelope address (or set of addresses) in the official,
+ * Crispin-approved braindead format.  (Note that we can't use this for
+ * the "From" address because its data may come from a number of different
+ * fields.  But we can use it for "To" and possibly others.
+ */
+void imap_output_envelope_addr(char *addr) {
+       char individual_addr[SIZ];
+       int num_addrs;
+       int i;
+       char user[SIZ];
+       char node[SIZ];
+       char name[SIZ];
+
+       if (addr == NULL) {
+               cprintf("NIL ");
+               return;
+       }
+
+       if (strlen(addr) == 0) {
+               cprintf("NIL ");
+               return;
+       }
+
+       cprintf("(");
+
+       /* How many addresses are listed here? */
+       num_addrs = num_tokens(addr, ',');
+
+       /* Output them one by one. */
+       for (i=0; i<num_addrs; ++i) {
+               extract_token(individual_addr, addr, i, ',');
+               striplt(individual_addr);
+               process_rfc822_addr(individual_addr, user, node, name);
+               cprintf("(");
+               imap_strout(name);
+               cprintf(" NIL ");
+               imap_strout(user);
+               cprintf(" ");
+               imap_strout(node);
+               cprintf(")");
+               if (i < (num_addrs-1)) cprintf(" ");
+       }
+
+       cprintf(") ");
+}
+
+
+/*
+ * Implements the ENVELOPE fetch item
+ * 
+ * Note that the imap_strout() function can cleverly output NULL fields as NIL,
+ * so we don't have to check for that condition like we do elsewhere.
+ */
+void imap_fetch_envelope(long msgnum, struct CtdlMessage *msg) {
+       char datestringbuf[SIZ];
+       time_t msgdate;
+       char *fieldptr = NULL;
+
+       /* Parse the message date into an IMAP-format date string */
+       if (msg->cm_fields['T'] != NULL) {
+               msgdate = atol(msg->cm_fields['T']);
+       }
+       else {
+               msgdate = time(NULL);
+       }
+       datestring(datestringbuf, sizeof datestringbuf,
+               msgdate, DATESTRING_IMAP);
+
+       /* Now start spewing data fields.  The order is important, as it is
+        * defined by the protocol specification.  Nonexistent fields must
+        * be output as NIL, existent fields must be quoted or literalled.
+        * The imap_strout() function conveniently does all this for us.
+        */
+       cprintf("ENVELOPE (");
+
+       /* Date */
+       imap_strout(datestringbuf);
+       cprintf(" ");
+
+       /* Subject */
+       imap_strout(msg->cm_fields['U']);
+       cprintf(" ");
+
+       /* From */
+       imap_output_envelope_from(msg);
+
+       /* Sender (default to same as 'From' if not present) */
+       fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Sender");
+       if (fieldptr != NULL) {
+               imap_output_envelope_addr(fieldptr);
+               free(fieldptr);
+       }
+       else {
+               imap_output_envelope_from(msg);
+       }
+
+       /* Reply-to */
+       fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Reply-to");
+       if (fieldptr != NULL) {
+               imap_output_envelope_addr(fieldptr);
+               free(fieldptr);
+       }
+       else {
+               imap_output_envelope_from(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);
+
+       /* Bcc */
+       fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Bcc");
+       imap_output_envelope_addr(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) free(fieldptr);
+
+       /* message ID */
+       imap_strout(msg->cm_fields['I']);
+
+       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.
+ */
+void imap_strip_headers(FILE *fp, char *section) {
+       char buf[SIZ];
+       char *which_fields = NULL;
+       int doing_headers = 0;
+       int headers_not = 0;
+       char *parms[SIZ];
+        int num_parms = 0;
+       int i;
+       char *boiled_headers = NULL;
+       int ok = 0;
+       int done_headers = 0;
+
+       which_fields = strdup(section);
+
+       if (!strncasecmp(which_fields, "HEADER.FIELDS", 13))
+               doing_headers = 1;
+       if (!strncasecmp(which_fields, "HEADER.FIELDS.NOT", 17))
+               headers_not = 1;
+
+       for (i=0; i<strlen(which_fields); ++i) {
+               if (which_fields[i]=='(')
+                       strcpy(which_fields, &which_fields[i+1]);
+       }
+       for (i=0; i<strlen(which_fields); ++i) {
+               if (which_fields[i]==')')
+                       which_fields[i] = 0;
+       }
+       num_parms = imap_parameterize(parms, which_fields);
+
+       fseek(fp, 0L, SEEK_END);
+       boiled_headers = malloc((size_t)(ftell(fp) + 256L));
+       strcpy(boiled_headers, "");
+
+       rewind(fp);
+       ok = 0;
+       while ( (done_headers == 0) && (fgets(buf, sizeof buf, fp) != NULL) ) {
+               if (!isspace(buf[0])) {
+                       ok = 0;
+                       if (doing_headers == 0) ok = 1;
+                       else {
+                               if (headers_not) ok = 1;
+                               else ok = 0;
+                               for (i=0; i<num_parms; ++i) {
+                                       if ( (!strncasecmp(buf, parms[i],
+                                          strlen(parms[i]))) &&
+                                          (buf[strlen(parms[i])]==':') ) {
+                                               if (headers_not) ok = 0;
+                                               else ok = 1;
+                                       }
+                               }
+                       }
+               }
+
+               if (ok) {
+                       strcat(boiled_headers, buf);
+               }
+
+               if (strlen(buf) == 0) done_headers = 1;
+               if (buf[0]=='\r') done_headers = 1;
+               if (buf[0]=='\n') 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);
+       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, &section[i+1]);
-       }
-       for (i=0; i<strlen(section); ++i) {
-               if (section[i]==']') section[i] = 0;
+       safestrncpy(section, item, sizeof section);
+       if (strchr(section, '[') != NULL) {
+               stripallbut(section, '[', ']');
        }
-       lprintf(9, "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;
-       }
-       lprintf(9, "Partial is %s\n", partial);
 
-       tmp = tmpfile();
-       if (tmp == NULL) {
-               lprintf(1, "Cannot open temp file: %s\n", strerror(errno));
-               return;
+       /* 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);
+
+       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, "")) {             /* the whole thing */
+       if (IMAP->cached_body != NULL) {
+               tmp = IMAP->cached_body;
+TRACE;
+       }
+       else if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
+TRACE;
                CtdlRedirectOutput(tmp, -1);
-               CtdlOutputMsg(msgnum, MT_RFC822, 0, 0, 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;
        }
 
        /*
-        * Be obnoxious and send the entire header, even if the client only
-        * asks for certain fields.  FIXME this shortcut later.
+        * If the client asked for just headers, or just particular header
+        * 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);
+       }
+
+       /*
+        * Strip it down if the client asked for everything _except_ headers.
+        */
+       else if (!strncasecmp(section, "TEXT", 4)) {
                CtdlRedirectOutput(tmp, -1);
-               CtdlOutputMsg(msgnum, MT_RFC822, 1, 0, 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);
-               fprintf(tmp, "\r\n");   /* add the trailing newline */
+TRACE;
        }
 
        /*
@@ -282,84 +652,314 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
         * (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,
+                               *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;
-               cprintf("BODY[%s] {%ld}<%ld>\r\n",
-                       section, bytes_remaining, pstart);
+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);
+       }
 
-       if (is_peek) {
-               /* FIXME set the last read pointer or something */
+       /* Mark this message as "seen" *unless* this is a "peek" operation */
+TRACE;
+       if (is_peek == 0) {
+               CtdlSetSeen(msgnum, 1, ctdlsetseen_seen);
        }
+TRACE;
+}
+
+/*
+ * Called immediately before outputting a multipart bodystructure
+ */
+void imap_fetch_bodystructure_pre(
+               char *name, char *filename, char *partnum, char *disp,
+               void *content, char *cbtype, size_t length, char *encoding,
+               void *cbuserdata
+               ) {
+
+       cprintf("(");
 }
 
 
 
 /*
- * imap_do_fetch() calls imap_do_fetch_msg() to output the deta of an
- * individual message, once it has been successfully loaded from disk.
+ * Called immediately after outputting a multipart bodystructure
  */
-void imap_do_fetch_msg(int seq, struct CtdlMessage *msg,
-                       int num_items, char **itemlist) {
-       int i;
+void imap_fetch_bodystructure_post(
+               char *name, char *filename, char *partnum, char *disp,
+               void *content, char *cbtype, size_t length, char *encoding,
+               void *cbuserdata
+               ) {
 
-       cprintf("* %d FETCH (", seq);
+       char subtype[SIZ];
 
-       for (i=0; i<num_items; ++i) {
+       cprintf(" ");
+
+       /* disposition */
+       extract_token(subtype, cbtype, 1, '/');
+       imap_strout(subtype);
+
+       /* body language */
+       cprintf(" NIL");
+
+       cprintf(")");
+}
+
+
+
+/*
+ * Output the info for a MIME part in the format required by BODYSTRUCTURE.
+ *
+ */
+void imap_fetch_bodystructure_part(
+               char *name, char *filename, char *partnum, char *disp,
+               void *content, char *cbtype, size_t length, char *encoding,
+               void *cbuserdata
+               ) {
+
+       int have_cbtype = 0;
+       int have_encoding = 0;
+       int lines = 0;
+       size_t i;
+       char cbmaintype[SIZ];
+       char cbsubtype[SIZ];
+
+       if (cbtype != NULL) if (strlen(cbtype)>0) have_cbtype = 1;
+       if (have_cbtype) {
+               extract_token(cbmaintype, cbtype, 0, '/');
+               extract_token(cbsubtype, cbtype, 1, '/');
+       }
+       else {
+               strcpy(cbmaintype, "TEXT");
+               strcpy(cbsubtype, "PLAIN");
+       }
 
-               if (!strncasecmp(itemlist[i], "BODY[", 5)) {
-                       imap_fetch_body(IMAP->msgids[seq-1], itemlist[i],
-                                       0, msg);
+       cprintf("(");
+       imap_strout(cbmaintype);
+       cprintf(" ");
+       imap_strout(cbsubtype);
+       cprintf(" ");
+
+       cprintf("(\"CHARSET\" \"US-ASCII\"");
+
+       if (name != NULL) if (strlen(name)>0) {
+               cprintf(" \"NAME\" ");
+               imap_strout(name);
+       }
+
+       cprintf(") ");
+
+       cprintf("NIL ");        /* Body ID */
+       cprintf("NIL ");        /* Body description */
+
+       if (encoding != NULL) if (strlen(encoding) > 0)  have_encoding = 1;
+       if (have_encoding) {
+               imap_strout(encoding);
+       }
+       else {
+               imap_strout("7BIT");
+       }
+       cprintf(" ");
+
+       /* The next field is the size of the part in bytes. */
+       cprintf("%ld ", (long)length);  /* bytes */
+
+       /* The next field is the number of lines in the part, if and only
+        * if the part is TEXT.  Crispin is a fscking idiot.
+        */
+       if (!strcasecmp(cbmaintype, "TEXT")) {
+               if (length) for (i=0; i<length; ++i) {
+                       if (((char *)content)[i] == '\n') ++lines;
                }
-               else if (!strncasecmp(itemlist[i], "BODY.PEEK[", 10)) {
-                       imap_fetch_body(IMAP->msgids[seq-1], itemlist[i],
-                                       1, msg);
+               cprintf("%d ", lines);
+       }
+
+       /* More of Crispin being a fscking idiot */
+       if ((!strcasecmp(cbmaintype, "MESSAGE"))
+          && (!strcasecmp(cbsubtype, "RFC822"))) {
+               /* FIXME
+                     A body type of type MESSAGE and subtype RFC822
+                     contains, immediately after the basic fields, the
+                     envelope structure, body structure, and size in
+                     text lines of the encapsulated message.
+               */
+       }
+
+       /* MD5 value of body part; we can get away with NIL'ing this */
+       cprintf("NIL ");
+
+       /* Disposition */
+       if (disp == NULL) {
+               cprintf("NIL");
+       }
+       else if (strlen(disp) == 0) {
+               cprintf("NIL");
+       }
+       else {
+               cprintf("(");
+               imap_strout(disp);
+               if (filename != NULL) if (strlen(filename)>0) {
+                       cprintf(" (\"FILENAME\" ");
+                       imap_strout(filename);
+                       cprintf(")");
                }
-               else if (!strcasecmp(itemlist[i], "BODYSTRUCTURE")) {
-                       /* FIXME do something here */
+               cprintf(")");
+       }
+
+       /* Body language (not defined yet) */
+       cprintf(" NIL)");
+}
+
+
+
+/*
+ * Spew the BODYSTRUCTURE data for a message.  (Do you need a silencer if
+ * you're going to shoot a MIME?  Do you need a reason to shoot Mark Crispin?
+ * No, and no.)
+ *
+ */
+void imap_fetch_bodystructure (long msgnum, char *item,
+               struct CtdlMessage *msg) {
+       FILE *tmp;
+       char buf[SIZ];
+       long lines = 0L;
+       long start_of_body = 0L;
+       long body_bytes = 0L;
+
+       /* 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.
+                */
+               tmp = tmpfile();
+               if (tmp == NULL) return;
+               CtdlRedirectOutput(tmp, -1);
+               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+               CtdlRedirectOutput(NULL, -1);
+
+               rewind(tmp);
+               while (fgets(buf, sizeof buf, tmp) != NULL) {
+                       ++lines;
+                       if ((!strcmp(buf, "\r\n")) && (start_of_body == 0L)) {
+                               start_of_body = ftell(tmp);
+                       }
                }
-               else if (!strcasecmp(itemlist[i], "ENVELOPE")) {
-                       /* FIXME do something here */
+               body_bytes = ftell(tmp) - start_of_body;
+               fclose(tmp);
+
+               cprintf("BODYSTRUCTURE (\"TEXT\" \"PLAIN\" "
+                       "(\"CHARSET\" \"US-ASCII\") NIL NIL "
+                       "\"7BIT\" %ld %ld)", body_bytes, lines);
+
+               return;
+       }
+
+       /* For messages already stored in RFC822 format, we have to parse. */
+       cprintf("BODYSTRUCTURE ");
+       mime_parser(msg->cm_fields['M'],
+                       NULL,
+                       *imap_fetch_bodystructure_part, /* part */
+                       *imap_fetch_bodystructure_pre,  /* pre-multi */
+                       *imap_fetch_bodystructure_post, /* post-multi */
+                       NULL,
+                       1);     /* don't decode -- we want it as-is */
+}
+
+
+/*
+ * imap_do_fetch() calls imap_do_fetch_msg() to output the data of an
+ * individual message, once it has been selected for output.
+ */
+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) {
+
+               /* 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(msg);
-               }
-               else if (!strcasecmp(itemlist[i], "INTERNALDATE")) {
-                       imap_fetch_internaldate(msg);
+                       imap_fetch_flags(seq-1);
                }
+
+               /* 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]);
                }
@@ -372,14 +972,38 @@ void imap_do_fetch_msg(int seq, struct CtdlMessage *msg,
                else if (!strcasecmp(itemlist[i], "RFC822.TEXT")) {
                        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);
+       }
 }
 
 
@@ -390,18 +1014,12 @@ void imap_do_fetch_msg(int seq, struct CtdlMessage *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_FETCHED) {
-               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);
+                       }
                }
        }
 }
@@ -414,7 +1032,7 @@ void imap_do_fetch(int num_items, char **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)]==' ') {
@@ -535,49 +1153,60 @@ int imap_extract_data_items(char **argv, char *items) {
 /*
  * One particularly hideous aspect of IMAP is that we have to allow the client
  * to specify arbitrary ranges and/or sets of messages to fetch.  Citadel IMAP
- * handles this by setting the IMAP_FETCHED flag for each message specified in
+ * handles this by setting the IMAP_SELECTED flag for each message specified in
  * the ranges/sets, then looping through the message array, outputting messages
  * with the flag set.  We don't bother returning an error if an out-of-range
  * number is specified (we just return quietly) because any client braindead
  * enough to request a bogus message number isn't going to notice the
  * difference anyway.
  *
- * This function clears out the IMAP_FETCHED bits, then sets that bit for each
+ * This function clears out the IMAP_SELECTED bits, then sets that bit for each
  * message included in the specified range.
  *
  * Set is_uid to 1 to fetch by UID instead of sequence number.
  */
-void imap_pick_range(char *range, int is_uid) {
+void imap_pick_range(char *supplied_range, int is_uid) {
        int i;
        int num_sets;
        int s;
-       char setstr[1024], lostr[1024], histr[1024];
-       int lo, hi;
+       char setstr[SIZ], lostr[SIZ], histr[SIZ];
+       long lo, hi;
+       char actual_range[SIZ];
+
+       /* 
+        * Handle the "ALL" macro
+        */
+       if (!strcasecmp(supplied_range, "ALL")) {
+               safestrncpy(actual_range, "1:*", sizeof actual_range);
+       }
+       else {
+               safestrncpy(actual_range, supplied_range, sizeof actual_range);
+       }
 
        /*
-        * Clear out the IMAP_FETCHED flags for all messages.
+        * Clear out the IMAP_SELECTED flags for all messages.
         */
-       for (i = 1; i <= IMAP->num_msgs; ++i) {
-               IMAP->flags[i-1] = IMAP->flags[i-1] & ~IMAP_FETCHED;
+       for (i = 0; i < IMAP->num_msgs; ++i) {
+               IMAP->flags[i] = IMAP->flags[i] & ~IMAP_SELECTED;
        }
 
        /*
         * Now set it for all specified messages.
         */
-       num_sets = num_tokens(range, ',');
+       num_sets = num_tokens(actual_range, ',');
        for (s=0; s<num_sets; ++s) {
-               extract_token(setstr, range, s, ',');
+               extract_token(setstr, actual_range, s, ',');
 
                extract_token(lostr, setstr, 0, ':');
                if (num_tokens(setstr, ':') >= 2) {
                        extract_token(histr, setstr, 1, ':');
-                       if (!strcmp(histr, "*")) sprintf(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) {
@@ -585,17 +1214,18 @@ void imap_pick_range(char *range, int is_uid) {
                                if ( (IMAP->msgids[i-1]>=lo)
                                   && (IMAP->msgids[i-1]<=hi)) {
                                        IMAP->flags[i-1] =
-                                               IMAP->flags[i-1] | IMAP_FETCHED;
+                                               IMAP->flags[i-1] | IMAP_SELECTED;
                                }
                        }
                        else {          /* fetch by uid */
                                if ( (i>=lo) && (i<=hi)) {
                                        IMAP->flags[i-1] =
-                                               IMAP->flags[i-1] | IMAP_FETCHED;
+                                               IMAP->flags[i-1] | IMAP_SELECTED;
                                }
                        }
                }
        }
+
 }
 
 
@@ -604,8 +1234,8 @@ void imap_pick_range(char *range, int is_uid) {
  * This function is called by the main command loop.
  */
 void imap_fetch(int num_parms, char *parms[]) {
-       char items[1024];
-       char *itemlist[256];
+       char items[SIZ];
+       char *itemlist[SIZ];
        int num_items;
        int i;
 
@@ -636,8 +1266,8 @@ void imap_fetch(int num_parms, char *parms[]) {
  * This function is called by the main command loop.
  */
 void imap_uidfetch(int num_parms, char *parms[]) {
-       char items[1024];
-       char *itemlist[256];
+       char items[SIZ];
+       char *itemlist[SIZ];
        int num_items;
        int i;
        int have_uid_item = 0;