* migrate append to StrBuf; switch the lineconverter out to stringbuf

diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index 5c3a127969482b1ba0272a7ae69657444a8e2b95..ef7f48b26675d7587adb86069aca5264fd46e443 100644 (file)
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -285,7 +285,6 @@ void imap_do_append_flags(long new_msgnum, char *new_message_flags) {
 void imap_append(int num_parms, char *parms[]) {
        long literal_length;
        long bytes_transferred;
-       long stripped_length = 0;
        struct CtdlMessage *msg = NULL;
        long new_msgnum = (-1L);
        int ret = 0;
@@ -332,21 +331,20 @@ void imap_append(int num_parms, char *parms[]) {
 
        Imap = IMAP;
        imap_free_transmitted_message();        /* just in case. */
-       Imap->transmitted_message = malloc(literal_length + 1);
-       if (Imap->transmitted_message == NULL) {
+
+       Imap->TransmittedMessage = NewStrBufPlain(NULL, literal_length);
+
+       if (Imap->TransmittedMessage == NULL) {
                cprintf("%s NO Cannot allocate memory.\r\n", parms[0]);
                return;
        }
-       Imap->transmitted_length = literal_length;
-
+       
        cprintf("+ Transmit message now.\r\n");
 
        bytes_transferred = 0;
+       client_read_blob(Imap->TransmittedMessage, literal_length, config.c_sleeping);
 
-       ret = client_read(Imap->transmitted_message, literal_length);
-       Imap->transmitted_message[literal_length] = 0;
-
-       if (ret != 1) {
+       if ((ret < 0) || (StrLength(Imap->TransmittedMessage) < literal_length)) {
                cprintf("%s NO Read failed.\r\n", parms[0]);
                return;
        }
@@ -359,20 +357,10 @@ void imap_append(int num_parms, char *parms[]) {
 
        /* Convert RFC822 newlines (CRLF) to Unix newlines (LF) */
        CtdlLogPrintf(CTDL_DEBUG, "Converting CRLF to LF\n");
-       stripped_length = 0;
-       for (i=0; i<literal_length; ++i) {
-               if (strncmp(&Imap->transmitted_message[i], "\r\n", 2)) {
-                       Imap->transmitted_message[stripped_length++] =
-                               Imap->transmitted_message[i];
-               }
-       }
-       literal_length = stripped_length;
-       Imap->transmitted_message[literal_length] = 0;  /* reterminate it */
+       StrBufToUnixLF(Imap->TransmittedMessage);
 
        CtdlLogPrintf(CTDL_DEBUG, "Converting message format\n");
-       msg = convert_internet_message(Imap->transmitted_message);
-       Imap->transmitted_message = NULL;
-       Imap->transmitted_length = 0;
+       msg = convert_internet_message_buf(&Imap->TransmittedMessage);
 
        ret = imap_grabroom(roomname, parms[2], 1);
        if (ret != 0) {

diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c
index e3f9e4b5fa37c5fe2e4cb77703795796492a96ca..de11077be0af8dcc469db8ab320e537929a13b64 100644 (file)
--- a/citadel/modules/imap/serv_imap.c
+++ b/citadel/modules/imap/serv_imap.c
@@ -113,11 +113,7 @@ void imap_free_msgids(void)
  */
 void imap_free_transmitted_message(void)
 {
-       if (IMAP->transmitted_message != NULL) {
-               free(IMAP->transmitted_message);
-               IMAP->transmitted_message = NULL;
-               IMAP->transmitted_length = 0;
-       }
+       FreeStrBuf(&IMAP->TransmittedMessage);
 }
 
 

diff --git a/citadel/modules/imap/serv_imap.h b/citadel/modules/imap/serv_imap.h
index 27ace03bf049f32648d5889f4b84535b48bb07e3..ee7d683084cecfe6ce8988ef7af41db2b07b930d 100644 (file)
--- a/citadel/modules/imap/serv_imap.h
+++ b/citadel/modules/imap/serv_imap.h
@@ -24,8 +24,7 @@ struct citimap {
        time_t last_mtime;              /* For checking whether the room was modified... */
        long *msgids;
        unsigned int *flags;
-       char *transmitted_message;      /* for APPEND command... */
-       size_t transmitted_length;
+       StrBuf *TransmittedMessage;     /* for APPEND command... */
 
        /* Cache most recent RFC822 FETCH because client might load in pieces */
        char *cached_rfc822_data;