From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 6 Nov 2011 20:01:56 +0000 (+0100)
Subject: IMAP FETCH Command: IAPuts immediately outputs the content; we need to go via the... 
X-Git-Tag: v8.11~393
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=01feb5e8d438e089fb7ae5232af89d67b7751df9

IMAP FETCH Command: IAPuts immediately outputs the content; we need to go via the CC->redirect_buffer; else message content and imap grammer mixes.
---

diff --git a/citadel/modules/imap/imap_fetch.c b/citadel/modules/imap/imap_fetch.c
index 5fedc283a..702a27f10 100644
--- a/citadel/modules/imap/imap_fetch.c
+++ b/citadel/modules/imap/imap_fetch.c
@@ -294,42 +294,42 @@ void imap_load_part(char *name, char *filename, char *partnum, char *disp,
 	);
 
 	if (!strcasecmp(partnum, desired_section)) {
-		iaputs(content, length);
+		client_write(content, length);
 	}
 
 	snprintf(mimebuf2, sizeof mimebuf2, "%s.MIME", partnum);
 
 	if (!strcasecmp(desired_section, mimebuf2)) {
-		IAPuts("Content-type: ");
-	 	_iaputs(cbtype);
+		client_write(HKEY("Content-type: "));
+	 	client_write(cbtype, strlen(cbtype));
 		if (!IsEmptyStr(cbcharset)) {
-			IAPuts("; charset=\"");
-			_iaputs(cbcharset);
-			IAPuts("\"");
+			client_write(HKEY("; charset=\""));
+			client_write(cbcharset, strlen(cbcharset));
+			client_write(HKEY("\""));
 		}
 		if (!IsEmptyStr(name)) {
-			IAPuts("; name=\"");
-			_iaputs(name);
-			IAPuts("\"");
+			client_write(HKEY("; name=\""));
+			client_write(name, strlen(name));
+			client_write(HKEY("\""));
 		}
-		IAPuts("\r\n");
+		client_write(HKEY("\r\n"));
 		if (!IsEmptyStr(encoding)) {
-			IAPuts("Content-Transfer-Encoding: ");
-			_iaputs(encoding);
-			IAPuts("\r\n");
+			client_write(HKEY("Content-Transfer-Encoding: "));
+			client_write(encoding, strlen(encoding));
+			client_write(HKEY("\r\n"));
 		}
 		if (!IsEmptyStr(encoding)) {
-			IAPuts("Content-Disposition: ");
-			_iaputs(disp);
+			client_write(HKEY("Content-Disposition: "));
+			client_write(disp, strlen(disp));
 		
 			if (!IsEmptyStr(filename)) {
-				IAPuts("; filename=\"");
-				_iaputs(filename);
-				IAPuts("\"");
+				client_write(HKEY("; filename=\""));
+				client_write(filename, strlen(filename));
+				client_write(HKEY("\""));
 			}
-			IAPuts("\r\n");
+			client_write(HKEY("\r\n"));
 		}
-		IAPrintf("Content-Length: %ld\r\n\r\n", (long)length);
+		cprintf("Content-Length: %ld\r\n\r\n", (long)length);
 	}
 }