#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"
FILE *output_fp;
};
-
-
-/*
- * Output the flags associated with a message. Note that this function
- * expects an index number in the array, *not* a sequence or uid number.
- */
-void imap_output_flags(int num) {
- cprintf("FLAGS (");
- if (IMAP->flags[num] & IMAP_DELETED) cprintf("\\Deleted ");
- cprintf(")");
-}
-
-
-
/*
* Individual field functions for imap_do_fetch_msg() ...
*/
cprintf("UID %ld", IMAP->msgids[seq-1]);
}
+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(")");
+}
+
void imap_fetch_internaldate(struct CtdlMessage *msg) {
char buf[SIZ];
time_t msgdate;
}
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");
}
/*
- * Strip any non header information out of a chunk of RFC822 data on disk
+ * 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) {
+void imap_strip_headers(FILE *fp, char *section) {
char buf[1024];
+ 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 = strdoop(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 = 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);
}
}
/*
- * 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);
CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 1, 0, 1);
CtdlRedirectOutput(NULL, -1);
- imap_strip_headers(tmp);
+ imap_strip_headers(tmp, section);
}
/*
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);
}
}
*imap_fetch_bodystructure_pre, /* pre-multi */
*imap_fetch_bodystructure_post, /* post-multi */
NULL,
- 0);
+ 1); /* don't decode -- we want it as-is */
}
imap_fetch_envelope(IMAP->msgids[seq-1], msg);
}
else if (!strcasecmp(itemlist[i], "FLAGS")) {
- imap_output_flags(seq-1);
+ imap_fetch_flags(seq-1);
}
else if (!strcasecmp(itemlist[i], "INTERNALDATE")) {
imap_fetch_internaldate(msg);
}
}
- /*
- * Make sure we didn't select any expunged messages.
- */
- for (i = 0; i < IMAP->num_msgs; ++i) {
- if (IMAP->flags[i] & IMAP_EXPUNGED) {
- lprintf(9, "eliminating %d because expunged\n", i);
- IMAP->flags[i] = IMAP->flags[i] & ~IMAP_SELECTED;
- }
- }
-
}