X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fserv_imap.c;h=1290276e27fec9c17980cf8fe112fce2d33efc21;hb=dc1d15a3a02aadae3c441f22d9db1601295f1f47;hp=55a80e8b0241f82f0aff512920a8c999e3855bba;hpb=fa222fcfed9856832eb86a3cbaae7a044ff6142b;p=citadel.git

diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c
index 55a80e8b0..1290276e2 100644
--- a/citadel/modules/imap/serv_imap.c
+++ b/citadel/modules/imap/serv_imap.c
@@ -293,7 +293,7 @@ void imap_add_single_msgid(long msgnum, void *userdata)
 	if (Imap->num_msgs > Imap->num_alloc) {
 		Imap->num_alloc += REALLOC_INCREMENT;
 		Imap->msgids = realloc(Imap->msgids, (Imap->num_alloc * sizeof(long)) );
-		Imap->flags = realloc(Imap->flags, (Imap->num_alloc * sizeof(unsigned int *)) );
+		Imap->flags = realloc(Imap->flags, (Imap->num_alloc * sizeof(unsigned int)) );
 	}
 	Imap->msgids[Imap->num_msgs - 1] = msgnum;
 	Imap->flags[Imap->num_msgs - 1] = 0;
@@ -320,16 +320,17 @@ void imap_load_msgids(void)
 	/* Load the message list */
 	cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
 	if (cdbfr != NULL) {
-		Imap->msgids = malloc(cdbfr->len);
-		memcpy(Imap->msgids, cdbfr->ptr, cdbfr->len);
+		Imap->msgids = (long*)cdbfr->ptr;
 		Imap->num_msgs = cdbfr->len / sizeof(long);
 		Imap->num_alloc = cdbfr->len / sizeof(long);
+		cdbfr->ptr = NULL;
+		cdbfr->len = 0;
 		cdb_free(cdbfr);
 	}
 
 	if (Imap->num_msgs) {
-		Imap->flags = malloc(Imap->num_alloc * sizeof(unsigned int *));
-		memset(Imap->flags, 0, (Imap->num_alloc * sizeof(long)) );
+		Imap->flags = malloc(Imap->num_alloc * sizeof(unsigned int));
+		memset(Imap->flags, 0, (Imap->num_alloc * sizeof(unsigned int)) );
 	}
 
 	imap_set_seen_flags(0);
@@ -371,14 +372,10 @@ void imap_rescan_msgids(void)
 	 */
 	cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
 	if (cdbfr != NULL) {
-		msglist = malloc(cdbfr->len + 1);
-		if (msglist == NULL) {
-			IMAPM_syslog(LOG_CRIT, "malloc() failed");
-			CC->kill_me = KILLME_MALLOC_FAILED;
-			return;
-		}
-		memcpy(msglist, cdbfr->ptr, (size_t)cdbfr->len);
+		msglist = (long*)cdbfr->ptr;
+		cdbfr->ptr = NULL;
 		num_msgs = cdbfr->len / sizeof(long);
+		cdbfr->len = 0;
 		cdb_free(cdbfr);
 	} else {
 		num_msgs = 0;
@@ -417,9 +414,8 @@ void imap_rescan_msgids(void)
 					 (Imap->num_msgs - i)));
 				memmove(&Imap->flags[i],
 					&Imap->flags[i + 1],
-					(sizeof(long) *
+					(sizeof(unsigned int) *
 					 (Imap->num_msgs - i)));
-
 				--i;
 			}
 
@@ -985,6 +981,7 @@ void imap_close(int num_parms, ConstStr *Params)
  */
 void imap_namespace(int num_parms, ConstStr *Params)
 {
+	long len;
 	int i;
 	struct floor *fl;
 	int floors = 0;
@@ -1005,8 +1002,8 @@ void imap_namespace(int num_parms, ConstStr *Params)
 		if (fl->f_flags & F_INUSE) {
 			/* if (floors > 0) IAPuts(" "); samjam says this confuses javamail */
 			IAPuts("(");
-			snprintf(Namespace, sizeof(Namespace), "%s/", fl->f_name);
-			plain_imap_strout(Namespace);
+			len = snprintf(Namespace, sizeof(Namespace), "%s/", fl->f_name);
+			IPutStr(Namespace, len);
 			IAPuts(" \"/\")");
 			++floors;
 		}
@@ -1158,6 +1155,7 @@ int imap_grabroom(char *returned_roomname, const char *foldername, int zapped_ok
  */
 void imap_status(int num_parms, ConstStr *Params)
 {
+	long len;
 	int ret;
 	char roomname[ROOMNAMELEN];
 	char imaproomname[SIZ];
@@ -1186,9 +1184,9 @@ void imap_status(int num_parms, ConstStr *Params)
 	 * names and simply spew all possible data items.  It's far easier to
 	 * code and probably saves us some processing time too.
 	 */
-	imap_mailboxname(imaproomname, sizeof imaproomname, &CC->room);
+	len = imap_mailboxname(imaproomname, sizeof imaproomname, &CC->room);
 	IAPuts("* STATUS ");
-	       plain_imap_strout(imaproomname);
+	IPutStr(imaproomname, len);
 	IAPrintf(" (MESSAGES %d ", msgs);
 	IAPrintf("RECENT %d ", new);	/* Initially, new==recent */
 	IAPrintf("UIDNEXT %ld ", CitControl.MMhighest + 1);