#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"
cprintf("UID %ld", IMAP->msgids[seq-1]);
}
-void imap_fetch_flags(struct CtdlMessage *msg) {
- cprintf("FLAGS ()"); /* FIXME do something here */
+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) {
/*
- * 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);
}
}
/*
* 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,
) {
char buf[SIZ];
+ int have_cbtype = 0;
+ int have_encoding = 0;
cprintf("(");
- if (cbtype == NULL) {
- cprintf("\"TEXT\" \"PLAIN\" ");
- }
- else {
+ if (cbtype != NULL) if (strlen(cbtype)>0) have_cbtype = 1;
+
+ if (have_cbtype) {
extract_token(buf, cbtype, 0, '/');
imap_strout(buf);
cprintf(" ");
imap_strout(buf);
cprintf(" ");
}
+ else {
+ cprintf("\"TEXT\" \"PLAIN\" ");
+ }
cprintf("(\"CHARSET\" \"US-ASCII\"");
- if (name != NULL) {
+ if (name != NULL) if (strlen(name)>0) {
cprintf(" \"NAME\" ");
imap_strout(name);
}
- if (filename != NULL) {
+ if (filename != NULL) if (strlen(filename)>0) {
cprintf(" \"FILENAME\" ");
imap_strout(name);
}
cprintf("NIL NIL ");
- if (encoding != NULL) {
+ if (encoding != NULL) if (strlen(encoding) > 0) have_encoding = 1;
+
+ if (have_encoding) {
imap_strout(encoding);
}
else {
cprintf("%ld ", length); /* bytes */
cprintf("NIL) "); /* lines */
-
}
* you're going to shoot a MIME? Do you need a reason to shoot Mark Crispin?
* No, and no.)
*
- * FIXME finish the implementation
*/
void imap_fetch_bodystructure (long msgnum, char *item,
struct CtdlMessage *msg) {
long lines = 0L;
long bytes = 0L;
-
/* For non-RFC822 (ordinary Citadel) messages, this is short and
* sweet...
*/
imap_fetch_envelope(IMAP->msgids[seq-1], msg);
}
else if (!strcasecmp(itemlist[i], "FLAGS")) {
- imap_fetch_flags(msg);
+ imap_fetch_flags(seq-1);
}
else if (!strcasecmp(itemlist[i], "INTERNALDATE")) {
imap_fetch_internaldate(msg);
if (IMAP->num_msgs > 0)
for (i = 0; i < IMAP->num_msgs; ++i)
- if (IMAP->flags[i] && IMAP_FETCHED) {
+ if (IMAP->flags[i] & IMAP_SELECTED) {
msg = CtdlFetchMessage(IMAP->msgids[i]);
if (msg != NULL) {
imap_do_fetch_msg(i+1, msg, num_items, itemlist);
/*
* One particularly hideous aspect of IMAP is that we have to allow the client
* to specify arbitrary ranges and/or sets of messages to fetch. Citadel IMAP
- * handles this by setting the IMAP_FETCHED flag for each message specified in
+ * handles this by setting the IMAP_SELECTED flag for each message specified in
* the ranges/sets, then looping through the message array, outputting messages
* with the flag set. We don't bother returning an error if an out-of-range
* number is specified (we just return quietly) because any client braindead
* enough to request a bogus message number isn't going to notice the
* difference anyway.
*
- * This function clears out the IMAP_FETCHED bits, then sets that bit for each
+ * This function clears out the IMAP_SELECTED bits, then sets that bit for each
* message included in the specified range.
*
* Set is_uid to 1 to fetch by UID instead of sequence number.
*/
-void imap_pick_range(char *range, int is_uid) {
+void imap_pick_range(char *supplied_range, int is_uid) {
int i;
int num_sets;
int s;
char setstr[SIZ], lostr[SIZ], histr[SIZ]; /* was 1024 */
int lo, hi;
- char *actual_range;
+ char actual_range[SIZ];
- actual_range = range;
- if (!strcasecmp(range, "ALL")) actual_range = "1:*";
+ /*
+ * Handle the "ALL" macro
+ */
+ if (!strcasecmp(supplied_range, "ALL")) {
+ safestrncpy(actual_range, "1:*", sizeof actual_range);
+ }
+ else {
+ safestrncpy(actual_range, supplied_range, sizeof actual_range);
+ }
/*
- * Clear out the IMAP_FETCHED flags for all messages.
+ * Clear out the IMAP_SELECTED flags for all messages.
*/
- for (i = 1; i <= IMAP->num_msgs; ++i) {
- IMAP->flags[i-1] = IMAP->flags[i-1] & ~IMAP_FETCHED;
+ for (i = 0; i < IMAP->num_msgs; ++i) {
+ IMAP->flags[i] = IMAP->flags[i] & ~IMAP_SELECTED;
}
/*
if ( (IMAP->msgids[i-1]>=lo)
&& (IMAP->msgids[i-1]<=hi)) {
IMAP->flags[i-1] =
- IMAP->flags[i-1] | IMAP_FETCHED;
+ IMAP->flags[i-1] | IMAP_SELECTED;
}
}
else { /* fetch by uid */
if ( (i>=lo) && (i<=hi)) {
IMAP->flags[i-1] =
- IMAP->flags[i-1] | IMAP_FETCHED;
+ IMAP->flags[i-1] | IMAP_SELECTED;
}
}
}
}
+
}
projects / citadel.git / blobdiff