CtdlDeleteMessages() now has a bulk API. Updated all of the

[citadel.git] / citadel / serv_imap.c

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index d812d671b9089b1986fc5300bfd416d2996e3363..fd64162af26a53ea7370303c1ae1f09a8ca79263 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -434,7 +434,7 @@ void imap_cleanup_function(void)
  * output this stuff in other places as well)
  */
 void imap_output_capability_string(void) {
-       cprintf("CAPABILITY IMAP4REV1 NAMESPACE AUTH=LOGIN");
+       cprintf("CAPABILITY IMAP4REV1 NAMESPACE ID AUTH=LOGIN");
 #ifdef HAVE_OPENSSL
        if (!CC->redirect_ssl) cprintf(" STARTTLS");
 #endif
@@ -453,6 +453,23 @@ void imap_capability(int num_parms, char *parms[])
 
 
 
+/*
+ * Implements the ID command (specified by RFC2971)
+ *
+ * We ignore the client-supplied information, and output a NIL response.
+ * Although this is technically a valid implementation of the extension, it
+ * is quite useless.  It exists only so that we may see which clients are
+ * making use of this extension.
+ * 
+ */
+void imap_id(int num_parms, char *parms[])
+{
+       cprintf("* ID NIL\r\n");
+       cprintf("%s OK ID completed\r\n", parms[0]);
+}
+
+
+
 /*
  * Here's where our IMAP session begins its happy day.
  */
@@ -677,7 +694,7 @@ void imap_select(int num_parms, char *parms[])
         * automatically expunges mailboxes when they are de-selected.
         */
        cprintf("* FLAGS (\\Deleted \\Seen \\Answered)\r\n");
-       cprintf("* OK [PERMANENTFLAGS (\\Seen \\Answered)] "
+       cprintf("* OK [PERMANENTFLAGS (\\Deleted \\Seen \\Answered)] "
                "permanent flags\r\n");
 
        cprintf("%s OK [%s] %s completed\r\n",
@@ -688,32 +705,38 @@ void imap_select(int num_parms, char *parms[])
 
 
 /*
- * does the real work for expunge
+ * Does the real work for expunge.
  */
 int imap_do_expunge(void)
 {
        int i;
        int num_expunged = 0;
+       long *delmsgs = NULL;
+       int num_delmsgs = 0;
 
        lprintf(CTDL_DEBUG, "imap_do_expunge() called\n");
        if (IMAP->selected == 0) {
                return (0);
        }
 
-       if (IMAP->num_msgs > 0)
+       if (IMAP->num_msgs > 0) {
+               delmsgs = malloc(IMAP->num_msgs * sizeof(long));
                for (i = 0; i < IMAP->num_msgs; ++i) {
                        if (IMAP->flags[i] & IMAP_DELETED) {
-                               CtdlDeleteMessages(CC->room.QRname,
-                                                  IMAP->msgids[i], "");
-                               ++num_expunged;
+                               delmsgs[num_delmsgs++] = IMAP->msgids[i];
                        }
                }
+               CtdlDeleteMessages(CC->room.QRname, delmsgs, num_delmsgs, "", 1);
+               num_expunged += num_delmsgs;
+               free(delmsgs);
+       }
 
        if (num_expunged > 0) {
                imap_rescan_msgids();
        }
 
-       lprintf(CTDL_DEBUG, "Expunged %d messages.\n", num_expunged);
+       lprintf(CTDL_DEBUG, "Expunged %d messages from <%s>\n",
+               num_expunged, CC->room.QRname);
        return (num_expunged);
 }
 
@@ -1195,7 +1218,7 @@ void imap_delete(int num_parms, char *parms[])
        char savedroom[ROOMNAMELEN];
        int msgs, new;
 
-       ret = imap_grabroom(roomname, parms[2], 0);
+       ret = imap_grabroom(roomname, parms[2], 1);
        if (ret != 0) {
                cprintf("%s NO Invalid mailbox name, or access denied\r\n",
                        parms[0]);
@@ -1377,12 +1400,21 @@ void imap_command_loop(void)
        memset(cmdbuf, 0, sizeof cmdbuf);       /* Clear it, just in case */
        flush_output();
        if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
-               lprintf(CTDL_ERR, "IMAP socket is broken.  Ending session.\r\n");
+               lprintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
                CC->kill_me = 1;
                return;
        }
 
-       lprintf(CTDL_INFO, "IMAP: %s\n", cmdbuf);
+       if (IMAP->authstate == imap_as_expecting_password) {
+               lprintf(CTDL_INFO, "IMAP: <password>\n");
+       }
+       else if (bmstrcasestr(cmdbuf, " LOGIN ")) {
+               lprintf(CTDL_INFO, "IMAP: LOGIN...\n");
+       }
+       else {
+               lprintf(CTDL_INFO, "IMAP: %s\n", cmdbuf);
+       }
+
        while (strlen(cmdbuf) < 5)
                strcat(cmdbuf, " ");
 
@@ -1434,6 +1466,11 @@ void imap_command_loop(void)
                        parms[0]);
        }
 
+       else if (!strcasecmp(parms[1], "ID")) {
+               imap_id(num_parms, parms);
+       }
+
+
        else if (!strcasecmp(parms[1], "LOGOUT")) {
                if (IMAP->selected) {
                        imap_do_expunge();      /* yes, we auto-expunge */