preserve stringlengths when outputting stuff in the imap module

[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 465c6ea4002a75f3121ce5c0c9c90d78ed1285f7..14cd0476ecee1f613b20fe537bf9a7e08e4c258e 100644 (file)
--- a/citadel/modules/imap/imap_list.c
+++ b/citadel/modules/imap/imap_list.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009 by Art Cancro and others.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  This program is open source software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
@@ -97,7 +97,7 @@ void imap_list_floors(char *verb, int num_patterns, StrBuf **patterns)
                        }
                        if (match) {
                                IAPrintf("* %s (\\NoSelect \\HasChildren) \"/\" ", verb);
-                               plain_imap_strout(fl->f_name);
+                               IPutStr(fl->f_name, (fl->f_name)?strlen(fl->f_name):0);
                                IAPuts("\r\n");
                        }
                }
@@ -168,7 +168,8 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
        }
 
        if (yes_output_this_room) {
-               imap_mailboxname(MailboxName, sizeof MailboxName, qrbuf);
+               long len;
+               len = 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]), MailboxName)) {
@@ -177,7 +178,7 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
                }
                if (match) {
                        IAPrintf("* %s (%s) \"/\" ", ImapFilter->verb, return_options);
-                       plain_imap_strout(MailboxName);
+                       IPutStr(MailboxName, len);
                        IAPuts("\r\n");
                }
        }
@@ -189,13 +190,13 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
  */
 void imap_list(int num_parms, ConstStr *Params)
 {
-       citimap *Imap = IMAP;
+       struct CitContext *CCC = CC;
+       citimap *Imap = CCCIMAP;
        int i, j, paren_nest;
        ImapRoomListFilter ImapFilter;
        int selection_left = (-1);
        int selection_right = (-1);
        int return_left = (-1);
-       int return_right = (-1);
        int root_pos = 2;
        int patterns_left = 3;
        int patterns_right = 3;
@@ -377,7 +378,7 @@ void imap_list(int num_parms, ConstStr *Params)
                                          &Params[i], 
                                          1);
 
-                       syslog(LOG_DEBUG, "evaluating <%s>\n", Params[i].Key);
+                       IMAP_syslog(LOG_DEBUG, "evaluating <%s>", Params[i].Key);
 
                        if (!strcasecmp(Params[i].Key, "SUBSCRIBED")) {
                                ImapFilter.return_subscribed = 1;
@@ -388,7 +389,6 @@ void imap_list(int num_parms, ConstStr *Params)
                        }
 
                        if (paren_nest == 0) {
-                               return_right = i;       /* found end of patterns */
                                i = num_parms + 1;      /* break out of the loop */
                        }
                }
@@ -421,9 +421,8 @@ void imap_list(int num_parms, ConstStr *Params)
         */
        for (i=0; i<ImapFilter.num_patterns; ++i) {
                FreeStrBuf(&ImapFilter.patterns[i]);
-               free(ImapFilter.patterns);
-
        }
+       free(ImapFilter.patterns);
 
        IReplyPrintf("OK %s completed", ImapFilter.verb);
 }