* I dunno

[citadel.git] / citadel / imap_fetch.c

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index e97704866eba13cc99a811255b931e19295ca73e..6f07f64ffcec71bf455da58f2c2236268a2c569c 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -45,7 +45,7 @@
 
 
 struct imap_fetch_part {
-       char desired_section[256];
+       char desired_section[SIZ];
        FILE *output_fp;
 };
 
@@ -64,7 +64,7 @@ void imap_fetch_flags(struct CtdlMessage *msg) {
 }
 
 void imap_fetch_internaldate(struct CtdlMessage *msg) {
-       char buf[256];
+       char buf[SIZ];
        time_t msgdate;
 
        if (msg->cm_fields['T'] != NULL) {
@@ -256,7 +256,7 @@ void imap_output_envelope_from(struct CtdlMessage *msg) {
  * 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[256];
+       char datestringbuf[SIZ];
        time_t msgdate;
        char *fieldptr = NULL;
 
@@ -380,7 +380,7 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
                if (partial[i]=='>') partial[i] = 0;
        }
        if (is_partial == 0) strcpy(partial, "");
-       lprintf(9, "Partial is %s\n", partial);
+       if (strlen(partial) > 0) lprintf(9, "Partial is %s\n", partial);
 
        tmp = tmpfile();
        if (tmp == NULL) {
@@ -417,7 +417,7 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
                imfp.output_fp = tmp;
 
                mime_parser(msg->cm_fields['M'], NULL,
-                               *imap_load_part,
+                               *imap_load_part, NULL, NULL,
                                (void *)&imfp,
                                1);
        }
@@ -456,6 +456,95 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
        }
 }
 
+/*
+ * 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("(");
+}
+
+
+
+/*
+ * Called immediately after outputting a multipart bodystructure
+ */
+void imap_fetch_bodystructure_post(
+               char *name, char *filename, char *partnum, char *disp,
+               void *content, char *cbtype, size_t length, char *encoding,
+               void *cbuserdata
+               ) {
+
+       char subtype[SIZ];
+
+       extract_token(subtype, cbtype, 1, '/');
+       imap_strout(subtype);
+       cprintf(")");
+}
+
+
+
+/*
+ * Output the info for a MIME part in the format required by BODYSTRUCTURE.
+ *
+ * FIXME .... this needs oodles of work to get completed.
+ */
+void imap_fetch_bodystructure_part(
+               char *name, char *filename, char *partnum, char *disp,
+               void *content, char *cbtype, size_t length, char *encoding,
+               void *cbuserdata
+               ) {
+
+       char buf[SIZ];
+
+       cprintf("(");
+
+       if (cbtype == NULL) {
+               cprintf("\"TEXT\" \"PLAIN\" ");
+       }
+       else {
+               extract_token(buf, cbtype, 0, '/');
+               imap_strout(buf);
+               cprintf(" ");
+               extract_token(buf, cbtype, 1, '/');
+               imap_strout(buf);
+               cprintf(" ");
+       }
+
+       cprintf("(\"CHARSET\" \"US-ASCII\"");
+
+       if (name != NULL) {
+               cprintf(" \"NAME\" ");
+               imap_strout(name);
+       }
+
+       if (filename != NULL) {
+               cprintf(" \"FILENAME\" ");
+               imap_strout(name);
+       }
+
+       cprintf(") ");
+
+       cprintf("NIL NIL ");
+
+       if (encoding != NULL) {
+               imap_strout(encoding);
+       }
+       else {
+               imap_strout("7BIT");
+       }
+       cprintf(" ");
+
+       cprintf("%ld ", length);        /* bytes */
+       cprintf("NIL) ");               /* lines */
+
+}
+
+
 
 /*
  * Spew the BODYSTRUCTURE data for a message.  (Do you need a silencer if
@@ -493,15 +582,20 @@ void imap_fetch_bodystructure (long msgnum, char *item,
 
                cprintf("BODYSTRUCTURE (\"TEXT\" \"PLAIN\" "
                        "(\"CHARSET\" \"US-ASCII\") NIL NIL "
-                       "\"7BIT\" %ld %ld) ", bytes, lines);
+                       "\"7BIT\" %ld %ld)", bytes, lines);
 
                return;
        }
 
        /* For messages already stored in RFC822 format, we have to parse. */
-       /* FIXME do this! */
-
-
+       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,
+                       0);
 }
 
 
@@ -791,7 +885,7 @@ void imap_pick_range(char *range, int is_uid) {
  */
 void imap_fetch(int num_parms, char *parms[]) {
        char items[1024];
-       char *itemlist[256];
+       char *itemlist[SIZ];
        int num_items;
        int i;
 
@@ -823,7 +917,7 @@ void imap_fetch(int num_parms, char *parms[]) {
  */
 void imap_uidfetch(int num_parms, char *parms[]) {
        char items[1024];
-       char *itemlist[256];
+       char *itemlist[SIZ];
        int num_items;
        int i;
        int have_uid_item = 0;