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 17e41062bcf063b384e1d023a7d1bcbcbb45b0a6..14cd0476ecee1f613b20fe537bf9a7e08e4c258e 100644 (file)
--- a/citadel/modules/imap/imap_list.c
+++ b/citadel/modules/imap/imap_list.c
@@ -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");
                }
        }
@@ -420,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);
 }