Rewrite IMAP-Module to buffer its output

[citadel.git] / citadel / modules / imap / imap_list.c

diff --git a/citadel/modules/imap/imap_list.c b/citadel/modules/imap/imap_list.c
index 03e58afbab30d186277493e6582b72b6632c98e1..015ee1cd3d9e21e4b19e0b2be8970b96c5898d5a 100644 (file)
--- a/citadel/modules/imap/imap_list.c
+++ b/citadel/modules/imap/imap_list.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Implements the LIST and LSUB commands.
  *
  * Copyright (c) 2000-2009 by Art Cancro and others.
@@ -53,12 +51,11 @@
 #include "support.h"
 #include "config.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
-#include "imap_tools.h"
 #include "serv_imap.h"
+#include "imap_tools.h"
 #include "imap_fetch.h"
 #include "imap_search.h"
 #include "imap_store.h"
@@ -99,9 +96,9 @@ void imap_list_floors(char *verb, int num_patterns, StrBuf **patterns)
                                }
                        }
                        if (match) {
-                               cprintf("* %s (\\NoSelect \\HasChildren) \"/\" ", verb);
+                               IAPrintf("* %s (\\NoSelect \\HasChildren) \"/\" ", verb);
                                plain_imap_strout(fl->f_name);
-                               cprintf("\r\n");
+                               IAPuts("\r\n");
                        }
                }
        }
@@ -118,25 +115,30 @@ void imap_list_floors(char *verb, int num_patterns, StrBuf **patterns)
  */
 void imap_listroom(struct ctdlroom *qrbuf, void *data)
 {
-       char buf[SIZ];
+#define SUBSCRIBED_STR "\\Subscribed"
+#define HASCHILD_STR "\\HasChildren"
+       char MailboxName[SIZ];
        char return_options[256];
        int ra;
        int yes_output_this_room;
        ImapRoomListFilter *ImapFilter;
        int i = 0;
        int match = 0;
+       int ROLen;
 
        /* Here's how we break down the array of pointers passed to us */
        ImapFilter = (ImapRoomListFilter*)data;
 
        /* Only list rooms to which the user has access!! */
        yes_output_this_room = 0;
-       strcpy(return_options, "");
+       *return_options = '\0';
+       ROLen = 0;
        CtdlRoomAccess(qrbuf, &CC->user, &ra, NULL);
 
        if (ImapFilter->return_subscribed) {
                if (ra & UA_KNOWN) {
-                       strcat(return_options, "\\Subscribed");
+                       memcpy(return_options, HKEY(SUBSCRIBED_STR) + 1);
+                       ROLen += sizeof(SUBSCRIBED_STR) - 1;
                }
        }
 
@@ -148,9 +150,10 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
         */
        if (ImapFilter->return_children) {
                if (!IsEmptyStr(return_options)) {
-                       strcat(return_options, " ");
+                       memcpy(return_options + ROLen, HKEY(" "));
+                       ROLen ++;
                }
-               strcat(return_options, "\\HasChildren");
+               memcpy(return_options + ROLen, HKEY(SUBSCRIBED_STR) + 1);
        }
 
        if (ImapFilter->subscribed_rooms_only) {
@@ -165,17 +168,17 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
        }
 
        if (yes_output_this_room) {
-               imap_mailboxname(buf, sizeof buf, qrbuf);
+               imap_mailboxname(MailboxName, sizeof MailboxName, qrbuf);
                match = 0;
                for (i=0; i<ImapFilter->num_patterns; ++i) {
-                       if (imap_mailbox_matches_pattern(ChrPtr(ImapFilter->patterns[i]), buf)) {
+                       if (imap_mailbox_matches_pattern(ChrPtr(ImapFilter->patterns[i]), MailboxName)) {
                                match = 1;
                        }
                }
                if (match) {
-                       cprintf("* %s (%s) \"/\" ", ImapFilter->verb, return_options);
-                       plain_imap_strout(buf);
-                       cprintf("\r\n");
+                       IAPrintf("* %s (%s) \"/\" ", ImapFilter->verb, return_options);
+                       plain_imap_strout(MailboxName);
+                       IAPuts("\r\n");
                }
        }
 }
@@ -186,6 +189,7 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
  */
 void imap_list(int num_parms, ConstStr *Params)
 {
+       citimap *Imap = IMAP;
        int i, j, paren_nest;
        ImapRoomListFilter ImapFilter;
        int selection_left = (-1);
@@ -198,7 +202,7 @@ void imap_list(int num_parms, ConstStr *Params)
        int extended_list_in_use = 0;
 
        if (num_parms < 4) {
-               cprintf("%s BAD arguments invalid\r\n", Params[0].Key);
+               IReply("BAD arguments invalid");
                return;
        }
 
@@ -265,12 +269,12 @@ void imap_list(int num_parms, ConstStr *Params)
 
                /* Strip off the outer parentheses */
                if (Params[selection_left].Key[0] == '(') {
-                       TokenCutLeft(&IMAP->Cmd, 
+                       TokenCutLeft(&Imap->Cmd, 
                                     &Params[selection_left], 
                                     1);
                }
                if (Params[selection_right].Key[Params[selection_right].len-1] == ')') {
-                       TokenCutRight(&IMAP->Cmd, 
+                       TokenCutRight(&Imap->Cmd, 
                                      &Params[selection_right], 
                                      1);
                }
@@ -365,11 +369,11 @@ void imap_list(int num_parms, ConstStr *Params)
 
                        /* Might as well look for these while we're in here... */
                        if (Params[i].Key[0] == '(') 
-                               TokenCutLeft(&IMAP->Cmd, 
+                               TokenCutLeft(&Imap->Cmd, 
                                             &Params[i], 
                                             1);
                        if (Params[i].Key[Params[i].len-1] == ')')
-                           TokenCutRight(&IMAP->Cmd, 
+                           TokenCutRight(&Imap->Cmd, 
                                          &Params[i], 
                                          1);
 
@@ -399,7 +403,7 @@ void imap_list(int num_parms, ConstStr *Params)
         * reference parameter.
         */
        if ( (StrLength(ImapFilter.patterns[0]) == 0) && (extended_list_in_use == 0) ) {
-               cprintf("* %s (\\Noselect) \"/\" \"\"\r\n", ImapFilter.verb);
+               IAPrintf("* %s (\\Noselect) \"/\" \"\"\r\n", ImapFilter.verb);
        }
 
        /* Non-empty mailbox names, and any form of the extended LIST command,
@@ -421,5 +425,5 @@ void imap_list(int num_parms, ConstStr *Params)
 
        }
 
-       cprintf("%s OK %s completed\r\n", Params[0].Key, ImapFilter.verb);
+       IReplyPrintf("OK %s completed", ImapFilter.verb);
 }