serv_smtp.c serv_pop3.c internet_addressing.c parsedate.c genstamp.c \
domain.c clientsocket.c serv_inetcfg.c serv_rwho.c serv_bio.c \
serv_moderate.c client_passwords.c \
- serv_imap.c imap_tools.c imap_fetch.c \
+ serv_imap.c imap_tools.c imap_fetch.c imap_search.c \
serv_network.c serv_pas2.c md5.c
DEP_FILES=$(SOURCES:.c=.d)
modules/domain.mo: domain.mo
ln -f domain.mo modules
-modules/serv_imap.so: serv_imap.mo imap_tools.mo imap_fetch.mo
+modules/serv_imap.so: serv_imap.mo imap_tools.mo imap_fetch.mo imap_search.mo
$(LINK_SHARED) -o modules/serv_imap.so imap_tools.mo serv_imap.mo \
- imap_fetch.mo
+ imap_fetch.mo imap_search.mo
modules/serv_imap.mo: serv_imap.mo
ln -f serv_imap.mo modules
modules/imap_fetch.mo: imap_fetch.mo
ln -f imap_fetch.mo modules
+modules/imap_search.mo: imap_search.mo
+ ln -f imap_search.mo modules
+
aidepost: aidepost.o config.o $(LIBOBJS)
$(CC) aidepost.o config.o $(LIBOBJS) $(LDFLAGS) -o aidepost
int s;
char setstr[1024], lostr[1024], histr[1024];
int lo, hi;
+ char *actual_range;
+
+ actual_range = range;
+ if (!strcasecmp(range, "ALL")) actual_range = "1:*";
/*
* Clear out the IMAP_FETCHED flags for all messages.
/*
* Now set it for all specified messages.
*/
- num_sets = num_tokens(range, ',');
+ num_sets = num_tokens(actual_range, ',');
for (s=0; s<num_sets; ++s) {
- extract_token(setstr, range, s, ',');
+ extract_token(setstr, actual_range, s, ',');
extract_token(lostr, setstr, 0, ':');
if (num_tokens(setstr, ':') >= 2) {
--- /dev/null
+/*
+ * $Id$
+ *
+ * Implements the SEARCH command in IMAP.
+ * This command is way too convoluted. Marc Crispin is a fscking idiot.
+ *
+ */
+
+
+#include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <pwd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#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 "room_ops.h"
+#include "user_ops.h"
+#include "policy.h"
+#include "database.h"
+#include "msgbase.h"
+#include "tools.h"
+#include "internet_addressing.h"
+#include "mime_parser.h"
+#include "serv_imap.h"
+#include "imap_tools.h"
+#include "imap_fetch.h"
+#include "imap_search.h"
+#include "genstamp.h"
+
+
+
+
+
+
+/*
+ * imap_do_search() calls imap_do_search_msg() to output the deta of an
+ * individual message, once it has been successfully loaded from disk.
+ */
+void imap_do_search_msg(int seq, struct CtdlMessage *msg,
+ int num_items, char **itemlist, int is_uid) {
+
+ int is_valid = 0;
+
+ is_valid = 1; /* FIXME ... replace with a real test */
+
+ /*
+ * If the message meets the specified search criteria, output its
+ * sequence number *or* UID, depending on what the client wants.
+ */
+ if (is_valid) {
+ if (is_uid) cprintf("%ld ", IMAP->msgids[seq-1]);
+ else cprintf("%d ", seq);
+ }
+
+}
+
+
+
+/*
+ * imap_search() calls imap_do_search() to do its actual work, once it's
+ * validated and boiled down the request a bit.
+ */
+void imap_do_search(int num_items, char **itemlist, int is_uid) {
+ int i;
+ struct CtdlMessage *msg;
+
+ cprintf("* SEARCH ");
+ if (IMAP->num_msgs > 0)
+ for (i = 0; i < IMAP->num_msgs; ++i)
+ if (IMAP->flags[i] && IMAP_FETCHED) {
+ msg = CtdlFetchMessage(IMAP->msgids[i]);
+ if (msg != NULL) {
+ imap_do_search_msg(i+1, msg, num_items,
+ itemlist, is_uid);
+ CtdlFreeMessage(msg);
+ }
+ else {
+ lprintf(1, "SEARCH internal error\n");
+ }
+ }
+ cprintf("\r\n");
+}
+
+
+/*
+ * This function is called by the main command loop.
+ */
+void imap_search(int num_parms, char *parms[]) {
+ char items[1024];
+ char *itemlist[256];
+ int num_items;
+ int i;
+
+ if (num_parms < 4) {
+ cprintf("%s BAD invalid parameters\r\n", parms[0]);
+ return;
+ }
+
+ imap_pick_range(parms[2], 0);
+
+ strcpy(items, "");
+ for (i=3; i<num_parms; ++i) {
+ strcat(items, parms[i]);
+ if (i < (num_parms-1)) strcat(items, " ");
+ }
+
+ num_items = imap_extract_data_items(itemlist, items);
+ if (num_items < 1) {
+ cprintf("%s BAD invalid data item list\r\n", parms[0]);
+ return;
+ }
+
+ imap_do_search(num_items, itemlist, 0);
+ cprintf("%s OK SEARCH completed\r\n", parms[0]);
+}
+
+/*
+ * This function is called by the main command loop.
+ */
+void imap_uidsearch(int num_parms, char *parms[]) {
+ char items[1024];
+ char *itemlist[256];
+ int num_items;
+ int i;
+
+ if (num_parms < 5) {
+ cprintf("%s BAD invalid parameters\r\n", parms[0]);
+ return;
+ }
+
+ imap_pick_range(parms[3], 1);
+
+ strcpy(items, "");
+ for (i=4; i<num_parms; ++i) {
+ strcat(items, parms[i]);
+ if (i < (num_parms-1)) strcat(items, " ");
+ }
+
+ num_items = imap_extract_data_items(itemlist, items);
+ if (num_items < 1) {
+ cprintf("%s BAD invalid data item list\r\n", parms[0]);
+ return;
+ }
+
+ imap_do_search(num_items, itemlist, 1);
+ cprintf("%s OK UID SEARCH completed\r\n", parms[0]);
+}
+
+
#include "serv_imap.h"
#include "imap_tools.h"
#include "imap_fetch.h"
+#include "imap_search.h"
long SYM_IMAP;
imap_uidfetch(num_parms, parms);
}
+ else if (!strcasecmp(parms[1], "SEARCH")) {
+ imap_search(num_parms, parms);
+ }
+
+ else if ( (!strcasecmp(parms[1], "UID"))
+ && (!strcasecmp(parms[2], "SEARCH")) ) {
+ imap_uidsearch(num_parms, parms);
+ }
+
else if (!strcasecmp(parms[1], "CLOSE")) {
imap_close(num_parms, parms);
}
projects / citadel.git / commitdiff