Removed the logging facility from citserver, use syslog instead
[citadel.git] / citadel / modules / imap / imap_list.c
index 235acfdf48b3f76e50a56c30158e280018ee3136..465c6ea4002a75f3121ce5c0c9c90d78ed1285f7 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Implements the LIST and LSUB commands.
  *
  * Copyright (c) 2000-2009 by Art Cancro and others.
 #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"
 #include "ctdl_module.h"
 
 
+typedef struct __ImapRoomListFilter {
+       char verb[16];
+       int subscribed_rooms_only;
+       int return_subscribed;
+       int return_children;
+
+       int num_patterns;
+       int num_patterns_avail;
+       StrBuf **patterns;
+}ImapRoomListFilter;
+
 /*
  * Used by LIST and LSUB to show the floors in the listing
  */
-void imap_list_floors(char *verb, int num_patterns, char **patterns)
+void imap_list_floors(char *verb, int num_patterns, StrBuf **patterns)
 {
        int i;
        struct floor *fl;
@@ -83,14 +91,14 @@ void imap_list_floors(char *verb, int num_patterns, char **patterns)
                if (fl->f_flags & F_INUSE) {
                        match = 0;
                        for (j=0; j<num_patterns; ++j) {
-                               if (imap_mailbox_matches_pattern (patterns[j], fl->f_name)) {
+                               if (imap_mailbox_matches_pattern (ChrPtr(patterns[j]), fl->f_name)) {
                                        match = 1;
                                }
                        }
                        if (match) {
-                               cprintf("* %s (\\NoSelect \\HasChildren) \"/\" ", verb);
+                               IAPrintf("* %s (\\NoSelect \\HasChildren) \"/\" ", verb);
                                plain_imap_strout(fl->f_name);
-                               cprintf("\r\n");
+                               IAPuts("\r\n");
                        }
                }
        }
@@ -107,38 +115,30 @@ void imap_list_floors(char *verb, int num_patterns, char **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;
-
-       char **data_for_callback;
-       char *verb;
-       int subscribed_rooms_only;
-       int num_patterns;
-       char **patterns;
-       int return_subscribed = 0;
-       int return_children = 0;
+       ImapRoomListFilter *ImapFilter;
        int i = 0;
        int match = 0;
+       int ROLen;
 
        /* Here's how we break down the array of pointers passed to us */
-       data_for_callback = data;
-       verb = data_for_callback[0];
-       subscribed_rooms_only = (int) data_for_callback[1];
-       num_patterns = (int) data_for_callback[2];
-       patterns = (char **) data_for_callback[3];
-       return_subscribed = (int) data_for_callback[4];
-       return_children = (int) data_for_callback[5];
+       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 (return_subscribed) {
+       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,14 +148,15 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
         * the \HasChildren attribute for every room.
         * We'll fix this later when we have time.
         */
-       if (return_children) {
+       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 (subscribed_rooms_only) {
+       if (ImapFilter->subscribed_rooms_only) {
                if (ra & UA_KNOWN) {
                        yes_output_this_room = 1;
                }
@@ -167,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<num_patterns; ++i) {
-                       if (imap_mailbox_matches_pattern(patterns[i], buf)) {
+               for (i=0; i<ImapFilter->num_patterns; ++i) {
+                       if (imap_mailbox_matches_pattern(ChrPtr(ImapFilter->patterns[i]), MailboxName)) {
                                match = 1;
                        }
                }
                if (match) {
-                       cprintf("* %s (%s) \"/\" ", verb, return_options);
-                       plain_imap_strout(buf);
-                       cprintf("\r\n");
+                       IAPrintf("* %s (%s) \"/\" ", ImapFilter->verb, return_options);
+                       plain_imap_strout(MailboxName);
+                       IAPuts("\r\n");
                }
        }
 }
@@ -188,12 +189,9 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
  */
 void imap_list(int num_parms, ConstStr *Params)
 {
-       int subscribed_rooms_only = 0;
-       char verb[16];
+       citimap *Imap = IMAP;
        int i, j, paren_nest;
-       char *data_for_callback[6];
-       int num_patterns = 1;
-       char *patterns[MAX_PATTERNS];
+       ImapRoomListFilter ImapFilter;
        int selection_left = (-1);
        int selection_right = (-1);
        int return_left = (-1);
@@ -202,25 +200,29 @@ void imap_list(int num_parms, ConstStr *Params)
        int patterns_left = 3;
        int patterns_right = 3;
        int extended_list_in_use = 0;
-       int return_subscribed = 0;
-       int return_children = 0;
 
        if (num_parms < 4) {
-               cprintf("%s BAD arguments invalid\r\n", Params[0].Key);
+               IReply("BAD arguments invalid");
                return;
        }
 
+       ImapFilter.num_patterns = 1;
+       ImapFilter.return_subscribed = 0;
+       ImapFilter.return_children = 0;
+       ImapFilter.subscribed_rooms_only = 0;
+       
+
        /* parms[1] is the IMAP verb being used (e.g. LIST or LSUB)
         * This tells us how to behave, and what verb to return back to the caller
         */
-       safestrncpy(verb, Params[1].Key, sizeof verb);
+       safestrncpy(ImapFilter.verb, Params[1].Key, sizeof ImapFilter.verb);
        j = Params[1].len;
        for (i=0; i<j; ++i) {
-               verb[i] = toupper(verb[i]);
+               ImapFilter.verb[i] = toupper(ImapFilter.verb[i]);
        }
 
-       if (!strcasecmp(verb, "LSUB")) {
-               subscribed_rooms_only = 1;
+       if (!strcasecmp(ImapFilter.verb, "LSUB")) {
+               ImapFilter.subscribed_rooms_only = 1;
        }
 
        /*
@@ -267,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);
                }
@@ -280,7 +282,7 @@ void imap_list(int num_parms, ConstStr *Params)
                for (i=selection_left; i<=selection_right; ++i) {
 
                        if (!strcasecmp(Params[i].Key, "SUBSCRIBED")) {
-                               subscribed_rooms_only = 1;
+                               ImapFilter.subscribed_rooms_only = 1;
                        }
 
                        else if (!strcasecmp(Params[i].Key, "RECURSIVEMATCH")) {
@@ -294,6 +296,10 @@ void imap_list(int num_parms, ConstStr *Params)
        /* The folder root appears immediately after the selection options,
         * or in position 2 if no selection options were specified.
         */
+       ImapFilter.num_patterns_avail = num_parms + 1;
+       ImapFilter.patterns = malloc(ImapFilter.num_patterns_avail * sizeof(StrBuf*));
+       memset(ImapFilter.patterns, 0, ImapFilter.num_patterns_avail * sizeof(StrBuf*));
+
        patterns_left = root_pos + 1;
        patterns_right = root_pos + 1;
 
@@ -310,26 +316,42 @@ void imap_list(int num_parms, ConstStr *Params)
                                i = num_parms + 1;      /* break out of the loop */
                        }
                }
-               num_patterns = patterns_right - patterns_left + 1;
-               for (i=0; i<num_patterns; ++i) {
+               ImapFilter.num_patterns = patterns_right - patterns_left + 1;
+               for (i=0; i<ImapFilter.num_patterns; ++i) {
                        if (i < MAX_PATTERNS) {
-                               patterns[i] = malloc(512);
-                               snprintf(patterns[i], 512, "%s%s", Params[root_pos].Key, Params[patterns_left+i].Key);
+                               ImapFilter.patterns[i] = NewStrBufPlain(NULL, 
+                                                                       Params[root_pos].len + 
+                                                                       Params[patterns_left+i].len);
                                if (i == 0) {
-                                       strcpy(patterns[i], &patterns[i][1]);
+                                       if (Params[root_pos].len > 1)
+                                               StrBufAppendBufPlain(ImapFilter.patterns[i], 
+                                                                    1 + CKEY(Params[root_pos]) - 1, 0);
                                }
-                               if (i == num_patterns-1) {
-                                       patterns[i][strlen(patterns[i])-1] = 0;
+                               else
+                                       StrBufAppendBufPlain(ImapFilter.patterns[i], 
+                                                            CKEY(Params[root_pos]), 0);
+
+                               if (i == ImapFilter.num_patterns-1) {
+                                       if (Params[patterns_left+i].len > 1)
+                                               StrBufAppendBufPlain(ImapFilter.patterns[i], 
+                                                                    CKEY(Params[patterns_left+i]) - 1, 0);
                                }
+                               else StrBufAppendBufPlain(ImapFilter.patterns[i], 
+                                                         CKEY(Params[patterns_left+i]), 0);
+
                        }
+
                }
        }
        else {
-               num_patterns = 1;
-               patterns[0] = malloc(512);
-               snprintf(patterns[0], 512, "%s%s", 
-                        Params[root_pos].Key, 
-                        Params[patterns_left].Key);
+               ImapFilter.num_patterns = 1;
+               ImapFilter.patterns[0] = NewStrBufPlain(NULL, 
+                                                       Params[root_pos].len + 
+                                                       Params[patterns_left].len);
+               StrBufAppendBufPlain(ImapFilter.patterns[0], 
+                                    CKEY(Params[root_pos]), 0);
+               StrBufAppendBufPlain(ImapFilter.patterns[0], 
+                                    CKEY(Params[patterns_left]), 0);
        }
 
        /* If the word "RETURN" appears after the folder pattern list, then the client
@@ -347,22 +369,22 @@ 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);
 
-                       CtdlLogPrintf(9, "evaluating <%s>\n", Params[i].Key);
+                       syslog(LOG_DEBUG, "evaluating <%s>\n", Params[i].Key);
 
                        if (!strcasecmp(Params[i].Key, "SUBSCRIBED")) {
-                               return_subscribed = 1;
+                               ImapFilter.return_subscribed = 1;
                        }
 
                        else if (!strcasecmp(Params[i].Key, "CHILDREN")) {
-                               return_children = 1;
+                               ImapFilter.return_children = 1;
                        }
 
                        if (paren_nest == 0) {
@@ -374,36 +396,34 @@ void imap_list(int num_parms, ConstStr *Params)
 
        /* Now start setting up the data we're going to send to the CtdlForEachRoom() callback.
         */
-       data_for_callback[0] = (char *) verb;
-       data_for_callback[1] = (char *) subscribed_rooms_only;
-       data_for_callback[2] = (char *) num_patterns;
-       data_for_callback[3] = (char *) patterns;
-       data_for_callback[4] = (char *) return_subscribed;
-       data_for_callback[5] = (char *) return_children;
-
+       
        /* The non-extended LIST command is required to treat an empty
         * ("" string) mailbox name argument as a special request to return the
         * hierarchy delimiter and the root name of the name given in the
         * reference parameter.
         */
-       if ( (IsEmptyStr(patterns[0])) && (extended_list_in_use == 0) ) {
-               cprintf("* %s (\\Noselect) \"/\" \"\"\r\n", verb);
+       if ( (StrLength(ImapFilter.patterns[0]) == 0) && (extended_list_in_use == 0) ) {
+               IAPrintf("* %s (\\Noselect) \"/\" \"\"\r\n", ImapFilter.verb);
        }
 
        /* Non-empty mailbox names, and any form of the extended LIST command,
         * is handled by this loop.
         */
        else {
-               imap_list_floors(verb, num_patterns, patterns);
-               CtdlForEachRoom(imap_listroom, data_for_callback);
+               imap_list_floors(ImapFilter.verb, 
+                                ImapFilter.num_patterns, 
+                                ImapFilter.patterns);
+               CtdlForEachRoom(imap_listroom, (char**)&ImapFilter);
        }
 
        /* 
         * Free the pattern buffers we allocated above.
         */
-       for (i=0; i<num_patterns; ++i) {
-               free(patterns[i]);
+       for (i=0; i<ImapFilter.num_patterns; ++i) {
+               FreeStrBuf(&ImapFilter.patterns[i]);
+               free(ImapFilter.patterns);
+
        }
 
-       cprintf("%s OK %s completed\r\n", Params[0].Key, verb);
+       IReplyPrintf("OK %s completed", ImapFilter.verb);
 }