* imap bodystructure

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index a60a03232726ccc58a43ebb5ab6f87334bd86db7..3a8883972fe003eb7005c7384ff4cb315a73ee54 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 573.72  2001/01/16 01:51:12  ajc
+ * imap bodystructure
+
  Revision 573.71  2001/01/16 00:46:40  ajc
  * Changed the MIME parser API *again* because we now need the ability to
    supply callback functions to be executed before and/or after parsing a
@@ -2335,3 +2338,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index ed9c55760cb777cc6a7941ccc1e6d4bccc81a22b..f381951790e50bdd74a012f4ba0917a6610aef8a 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -465,7 +465,7 @@ void imap_fetch_bodystructure_pre(
                void *cbuserdata
                ) {
 
-       cprintf("*PRE*");       /* FIXME obviously wrong */
+       cprintf("(");
 }
 
 
@@ -479,7 +479,11 @@ void imap_fetch_bodystructure_post(
                void *cbuserdata
                ) {
 
-       cprintf("*POST*");      /* FIXME obviously wrong */
+       char subtype[SIZ];
+
+       extract_token(subtype, cbtype, 1, '/');
+       imap_strout(subtype);
+       cprintf(")");
 }
 
 

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index 08011aff60c34891dd3c61068a34136b24613780..ea431d9fd4ccc22d9c9cd1f7987f273a6859bda9 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -353,8 +353,10 @@ void the_mime_parser(char *partnum,
                /* Tell the client about this message's multipartedness */
                PreMultiPartCallBack("", "", partnum, "", NULL, content_type,
                                0, encoding, userdata);
+               /*
                CallBack("", "", partnum, "", NULL, content_type,
                                0, encoding, userdata);
+                */
 
                /* Figure out where the boundaries are */
                sprintf(startary, "--%s", boundary);