fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / imap_fetch.c

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index a00b78f79517d4df6958c80f38698f1aae698de8..8b73dacf89d5b3481afff91af917b0b4d4d2aba9 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -16,14 +16,24 @@
 #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"
@@ -62,6 +72,7 @@ void imap_fetch_uid(int seq) {
 void imap_fetch_flags(int seq) {
        cprintf("FLAGS (");
        if (IMAP->flags[seq] & IMAP_DELETED) cprintf("\\Deleted ");
+       if (IMAP->flags[seq] & IMAP_SEEN) cprintf("\\Seen ");
        cprintf(")");
 }
 
@@ -336,13 +347,17 @@ void imap_strip_headers(FILE *fp, char *section) {
        char *parms[SIZ];
         int num_parms = 0;
        int i;
+       char *boiled_headers = NULL;
+       int ok = 0;
+       int done_headers = 0;
+
+       which_fields = strdoop(section);
 
        if (!strncasecmp(which_fields, "HEADER.FIELDS", 13))
                doing_headers = 1;
        if (!strncasecmp(which_fields, "HEADER.FIELDS.NOT", 17))
                headers_not = 1;
 
-       which_fields = strdoop(section);
        for (i=0; i<strlen(which_fields); ++i) {
                if (which_fields[i]=='(')
                        strcpy(which_fields, &which_fields[i+1]);
@@ -352,23 +367,50 @@ void imap_strip_headers(FILE *fp, char *section) {
                        which_fields[i] = 0;
        }
        num_parms = imap_parameterize(parms, which_fields);
-       for (i=0; i<num_parms; ++i) {
-               lprintf(9, "parm[%d] = <%s>\n", i, parms[i]);
-       }       /* FIXME do something here! */
 
-       phree(which_fields);
+       fseek(fp, 0L, SEEK_END);
+       boiled_headers = mallok((size_t)(ftell(fp) + 256L));
+       strcpy(boiled_headers, "");
 
        rewind(fp);
-       while (fgets(buf, sizeof buf, fp) != NULL) {
-               striplt(buf);
-               if (strlen(buf) == 0) {
-                       fflush(fp);
-                       ftruncate(fileno(fp), ftell(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;
        }
+
+       /* Now write it back */
+       rewind(fp);
+       fwrite(boiled_headers, strlen(boiled_headers), 1, fp);
+       fflush(fp);
+       ftruncate(fileno(fp), ftell(fp));
        fflush(fp);
        fprintf(fp, "\r\n");    /* add the trailing newline */
        rewind(fp);
+       phree(which_fields);
+       phree(boiled_headers);
 }
 
 
@@ -427,8 +469,8 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
        }
 
        /*
-        * 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)) {
                CtdlRedirectOutput(tmp, -1);
@@ -481,8 +523,9 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
 
        fclose(tmp);
 
-       if (is_peek) {
-               /* FIXME set the last read pointer or something */
+       /* Mark this message as "seen" *unless* this is a "peek" operation */
+       if (is_peek == 0) {
+               CtdlSetSeen(msgnum, 1);
        }
 }