* Renamed "dynloader" to "serv_extensions" globally. We don't want people

[citadel.git] / citadel / imap_fetch.c

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index 011119d3aca25d5e0b6b4e0cf7cc27ee2a306178..a17e47da347e1fb65a89669456a6eea06db603be 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -16,19 +16,29 @@
 #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"
@@ -77,7 +87,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);
 }
 
@@ -109,7 +119,7 @@ void imap_fetch_rfc822(int msgnum, char *whichfmt, struct CtdlMessage *msg) {
         * Load the message into a temp file for translation and measurement
         */ 
        CtdlRedirectOutput(tmp, -1);
-       CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+       CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
        CtdlRedirectOutput(NULL, -1);
        if (!is_valid_message(msg)) {
                lprintf(1, "WARNING: output clobbered the message!\n");
@@ -189,7 +199,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);
@@ -208,7 +218,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");
        }
                        
@@ -270,7 +280,7 @@ void imap_fetch_envelope(long msgnum, struct CtdlMessage *msg) {
        else {
                msgdate = time(NULL);
        }
-       datestring(datestringbuf, msgdate, DATESTRING_IMAP);
+       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
@@ -452,9 +462,17 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
 
        /* Now figure out what the client wants, and get it */
 
-       if (!strcmp(section, "")) {             /* the whole thing */
+       if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
                CtdlRedirectOutput(tmp, -1);
-               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+                                               HEADERS_NONE, 0, 1);
+               CtdlRedirectOutput(NULL, -1);
+       }
+
+       else if (!strcmp(section, "")) {
+               CtdlRedirectOutput(tmp, -1);
+               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+                                               HEADERS_ALL, 0, 1);
                CtdlRedirectOutput(NULL, -1);
        }
 
@@ -464,7 +482,8 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
         */
        else if (!strncasecmp(section, "HEADER", 6)) {
                CtdlRedirectOutput(tmp, -1);
-               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 1, 0, 1);
+               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+                                               HEADERS_ONLY, 0, 1);
                CtdlRedirectOutput(NULL, -1);
                imap_strip_headers(tmp, section);
        }
@@ -607,7 +626,7 @@ void imap_fetch_bodystructure_part(
        }
        cprintf(" ");
 
-       cprintf("%ld ", length);        /* bytes */
+       cprintf("%ld ", (long)length);  /* bytes */
        cprintf("NIL) ");               /* lines */
 }
 
@@ -660,7 +679,7 @@ void imap_fetch_bodystructure (long msgnum, char *item,
                        *imap_fetch_bodystructure_pre,  /* pre-multi */
                        *imap_fetch_bodystructure_post, /* post-multi */
                        NULL,
-                       0);
+                       1);     /* don't decode -- we want it as-is */
 }
 
 
@@ -923,7 +942,7 @@ void imap_pick_range(char *supplied_range, int is_uid) {
                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, "%d", INT_MAX);
                } 
                else {
                        strcpy(histr, lostr);