* Removed the built-in memory leak checker. It wasn't threadsafe and

[citadel.git] / citadel / serv_imap.c

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index 95c2ce7d19de96a78584ef621405069583f19e25..bee2dedb1077b1b2333523dc3ed58e1f820f712f 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -81,12 +81,12 @@ struct irlparms {
 void imap_free_msgids(void)
 {
        if (IMAP->msgids != NULL) {
-               phree(IMAP->msgids);
+               free(IMAP->msgids);
                IMAP->msgids = NULL;
                IMAP->num_msgs = 0;
        }
        if (IMAP->flags != NULL) {
-               phree(IMAP->flags);
+               free(IMAP->flags);
                IMAP->flags = NULL;
        }
 }
@@ -98,7 +98,7 @@ void imap_free_msgids(void)
 void imap_free_transmitted_message(void)
 {
        if (IMAP->transmitted_message != NULL) {
-               phree(IMAP->transmitted_message);
+               free(IMAP->transmitted_message);
                IMAP->transmitted_message = NULL;
                IMAP->transmitted_length = 0;
        }
@@ -142,18 +142,18 @@ void imap_add_single_msgid(long msgnum, void *userdata)
 
        IMAP->num_msgs = IMAP->num_msgs + 1;
        if (IMAP->msgids == NULL) {
-               IMAP->msgids = mallok(IMAP->num_msgs * sizeof(long)
+               IMAP->msgids = malloc(IMAP->num_msgs * sizeof(long)
                                      * REALLOC_INCREMENT);
        } else if (IMAP->num_msgs % REALLOC_INCREMENT == 0) {
-               IMAP->msgids = reallok(IMAP->msgids,
+               IMAP->msgids = realloc(IMAP->msgids,
                                       (IMAP->num_msgs +
                                        REALLOC_INCREMENT) * sizeof(long));
        }
        if (IMAP->flags == NULL) {
-               IMAP->flags = mallok(IMAP->num_msgs * sizeof(long)
+               IMAP->flags = malloc(IMAP->num_msgs * sizeof(long)
                                     * REALLOC_INCREMENT);
        } else if (IMAP->num_msgs % REALLOC_INCREMENT == 0) {
-               IMAP->flags = reallok(IMAP->flags,
+               IMAP->flags = realloc(IMAP->flags,
                                      (IMAP->num_msgs +
                                       REALLOC_INCREMENT) * sizeof(long));
        }
@@ -212,7 +212,7 @@ void imap_rescan_msgids(void)
         */
        cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
        if (cdbfr != NULL) {
-               msglist = mallok(cdbfr->len);
+               msglist = malloc(cdbfr->len);
                memcpy(msglist, cdbfr->ptr, cdbfr->len);
                num_msgs = cdbfr->len / sizeof(long);
                cdb_free(cdbfr);
@@ -285,7 +285,7 @@ void imap_rescan_msgids(void)
        }
 
        if (num_msgs != 0)
-               phree(msglist);
+               free(msglist);
 }
 
 
@@ -308,6 +308,19 @@ void imap_cleanup_function(void)
        lprintf(CTDL_DEBUG, "Performing IMAP cleanup hook\n");
        imap_free_msgids();
        imap_free_transmitted_message();
+
+       if (IMAP->cached_fetch != NULL) {
+               fclose(IMAP->cached_fetch);
+               IMAP->cached_fetch = NULL;
+               IMAP->cached_msgnum = (-1);
+       }
+
+       if (IMAP->cached_body != NULL) {
+               fclose(IMAP->cached_body);
+               IMAP->cached_body = NULL;
+               IMAP->cached_bodymsgnum = (-1);
+       }
+
        lprintf(CTDL_DEBUG, "Finished IMAP cleanup hook\n");
 }
 
@@ -322,6 +335,8 @@ void imap_greeting(void)
        strcpy(CC->cs_clientname, "IMAP session");
        CtdlAllocUserData(SYM_IMAP, sizeof(struct citimap));
        IMAP->authstate = imap_as_normal;
+       IMAP->cached_fetch = NULL;
+       IMAP->cached_msgnum = (-1);
 
        cprintf("* OK %s Citadel/UX IMAP4rev1 server ready\r\n",
                config.c_fqdn);
@@ -784,7 +799,7 @@ void imap_create(int num_parms, char *parms[])
        if (strchr(parms[2], '\\') != NULL) {
                cprintf("%s NO Invalid character in folder name\r\n",
                        parms[0]);
-               lprintf(9, "invalid character in folder name\n");
+               lprintf(CTDL_DEBUG, "invalid character in folder name\n");
                return;
        }
 
@@ -792,7 +807,7 @@ void imap_create(int num_parms, char *parms[])
        if (ret < 0) {
                cprintf("%s NO Invalid mailbox name or location\r\n",
                        parms[0]);
-               lprintf(9, "invalid mailbox name or location\n");
+               lprintf(CTDL_DEBUG, "invalid mailbox name or location\n");
                return;
        }
        floornum = (ret & 0x00ff);      /* lower 8 bits = floor number */
@@ -801,7 +816,7 @@ void imap_create(int num_parms, char *parms[])
        if (flags & IR_MAILBOX) {
                if (strncasecmp(parms[2], "INBOX|", 6)) {
                        cprintf("%s NO Personal folders must be created under INBOX\r\n", parms[0]);
-                       lprintf(9, "not subordinate to inbox\n");
+                       lprintf(CTDL_DEBUG, "not subordinate to inbox\n");
                        return;
                }
        }
@@ -823,7 +838,7 @@ void imap_create(int num_parms, char *parms[])
        } else {
                cprintf("%s OK CREATE completed\r\n", parms[0]);
        }
-       lprintf(9, "imap_create() completed\n");
+       lprintf(CTDL_DEBUG, "imap_create() completed\n");
 }
 
 
@@ -1106,7 +1121,7 @@ void imap_rename_backend(struct ctdlroom *qrbuf, void *data)
                                         sizeof newroomname,
                                         newfoldername) & 0xFF;
 
-               irlp = (struct irl *) mallok(sizeof(struct irl));
+               irlp = (struct irl *) malloc(sizeof(struct irl));
                strcpy(irlp->irl_newroom, newroomname);
                strcpy(irlp->irl_oldroom, qrbuf->QRname);
                irlp->irl_newfloor = newfloor;
@@ -1199,7 +1214,7 @@ void imap_rename(int num_parms, char *parms[])
                        }
                        irlp = irl;
                        irl = irl->next;
-                       phree(irlp);
+                       free(irlp);
                }
        }