war on BSD style curly braces

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

diff --git a/citadel/modules/imap/imap_tools.c b/citadel/modules/imap/imap_tools.c
index bced70fd1f3e4fd50a035b368d594a284ca3eebe..f6839c9e81e23e2d6c2a24c5d3d8bbc787f0d217 100644 (file)
--- a/citadel/modules/imap/imap_tools.c
+++ b/citadel/modules/imap/imap_tools.c
@@ -1,7 +1,7 @@
 /*
  * Utility functions for the IMAP module.
  *
- * Copyright (c) 2001-2009 by the citadel.org team and others, except for
+ * Copyright (c) 2001-2017 by the citadel.org team and others, except for
  * most of the UTF7 and UTF8 handling code which was lifted from Evolution.
  *
  * This program is open source software; you can redistribute it and/or modify
@@ -221,7 +221,7 @@ static char* toimap(char* destp, char* destend, char* src)
 
        *destp = 0;
        string_init(&dest, destp, destend-destp);
-       /* IMAP_syslog(LOG_DEBUG, "toimap %s", src); */
+       /* syslog(LOG_DEBUG, "toimap %s", src); */
 
        for (;;)
        {
@@ -287,7 +287,7 @@ static char* toimap(char* destp, char* destend, char* src)
 
        if (state == 1)
                utf7_closeb64(&dest, v, i);
-       /* IMAP_syslog(LOG_DEBUG, "    -> %s", destp); */
+       /* syslog(LOG_DEBUG, "    -> %s", destp); */
        return string_end(&dest);
 }
 
@@ -305,7 +305,7 @@ static char* fromimap(char* destp, char* destend, const char* src)
 
        *destp = 0;
        string_init(&dest, destp, destend-destp);
-       /* IMAP_syslog(LOG_DEBUG, "fromimap %s", src); */
+       /* syslog(LOG_DEBUG, "fromimap %s", src); */
 
        do {
                c = *p++;
@@ -363,7 +363,7 @@ static char* fromimap(char* destp, char* destend, const char* src)
                        }
        } while (c != '\0');
 
-       /* IMAP_syslog(LOG_DEBUG, "      -> %s", destp); */
+       /* syslog(LOG_DEBUG, "      -> %s", destp); */
        return string_end(&dest);
 }
 
@@ -552,11 +552,12 @@ int imap_parameterize(citimap_command *Cmd)
 
 /* Convert a struct ctdlroom to an IMAP-compatible mailbox name. */
 
-void imap_mailboxname(char *buf, int bufsize, struct ctdlroom *qrbuf)
+long imap_mailboxname(char *buf, int bufsize, struct ctdlroom *qrbuf)
 {
        char* bufend = buf+bufsize;
        struct floor *fl;
        char* p = buf;
+       const char *pend;
 
        /* For mailboxes, just do it straight.
         * Do the Cyrus-compatible thing: all private folders are
@@ -565,13 +566,17 @@ void imap_mailboxname(char *buf, int bufsize, struct ctdlroom *qrbuf)
        if (qrbuf->QRflags & QR_MAILBOX)
        {
                if (strcasecmp(qrbuf->QRname+11, MAILROOM) == 0)
-                       toimap(p, bufend, "INBOX");
+               {
+                       pend = toimap(p, bufend, "INBOX");
+                       return pend - buf;
+               }
                else
                {
                        p = toimap(p, bufend, "INBOX");
                        if (p < bufend)
                                *p++ = '/';
-                       toimap(p, bufend, qrbuf->QRname+11);
+                       pend = toimap(p, bufend, qrbuf->QRname+11);
+                       return pend - buf;
                }
        }
        else
@@ -582,7 +587,8 @@ void imap_mailboxname(char *buf, int bufsize, struct ctdlroom *qrbuf)
                p = toimap(p, bufend, fl->f_name);
                if (p < bufend)
                        *p++ = '/';
-               toimap(p, bufend, qrbuf->QRname);
+               pend = toimap(p, bufend, qrbuf->QRname);
+               return pend - buf;
        }
 }
 
@@ -600,7 +606,6 @@ void imap_mailboxname(char *buf, int bufsize, struct ctdlroom *qrbuf)
 
 int imap_roomname(char *rbuf, int bufsize, const char *foldername)
 {
-       struct CitContext *CCC = CC;
        int levels;
        char floorname[ROOMNAMELEN*2];
        char roomname[ROOMNAMELEN];
@@ -677,37 +682,10 @@ int imap_roomname(char *rbuf, int bufsize, const char *foldername)
        ret = (0 | IR_MAILBOX);
 
 exit:
-       IMAP_syslog(LOG_DEBUG, "(That translates to \"%s\")", rbuf);
+       syslog(LOG_DEBUG, "(That translates to \"%s\")", rbuf);
        return(ret);
 }
 
-/*
- * Output a struct internet_address_list in the form an IMAP client wants
- */
-void imap_ial_out(struct internet_address_list *ialist)
-{
-       struct internet_address_list *iptr;
-
-       if (ialist == NULL) {
-               IAPuts("NIL");
-               return;
-       }
-       IAPuts("(");
-
-       for (iptr = ialist; iptr != NULL; iptr = iptr->next) {
-               IAPuts("(");
-               plain_imap_strout(iptr->ial_name);
-               IAPuts(" NIL ");
-               plain_imap_strout(iptr->ial_user);
-               IAPuts(" ");
-               plain_imap_strout(iptr->ial_node);
-               IAPuts(")");
-       }
-
-       IAPuts(")");
-}
-
-
 
 /*
  * Determine whether the supplied string is a valid message set.
@@ -979,42 +957,6 @@ void IReplyPrintf(const char *Format, ...)
 }
 
 
-
-/* Output a string to the IMAP client, either as a literal or quoted.
- * (We do a literal if it has any double-quotes or backslashes.) */
-
-void plain_imap_strout(char *buf)
-{
-       int i;
-       int is_literal = 0;
-       long Len;
-       citimap *Imap = IMAP;
-
-       if (buf == NULL) {      /* yeah, we handle this */
-               IAPuts("NIL");
-               return;
-       }
-
-       Len = strlen(buf);
-       for (i = 0; i < Len; ++i) {
-               if ((buf[i] == '\"') || (buf[i] == '\\'))
-                       is_literal = 1;
-       }
-
-       if (is_literal) {
-               StrBufAppendPrintf(Imap->Reply, "{%ld}\r\n", Len);
-               StrBufAppendBufPlain(Imap->Reply, buf, Len, 0);
-       } else {
-               StrBufAppendBufPlain(Imap->Reply, 
-                                    HKEY("\""), 0);
-               StrBufAppendBufPlain(Imap->Reply, 
-                                    buf, Len, 0);
-               StrBufAppendBufPlain(Imap->Reply, 
-                                    HKEY("\""), 0);
-       }
-}
-
-
 /* Output a string to the IMAP client, either as a literal or quoted.
  * (We do a literal if it has any double-quotes or backslashes.) */