* extract_token() now expects to be supplied with the size of the

[citadel.git] / citadel / imap_misc.c

diff --git a/citadel/imap_misc.c b/citadel/imap_misc.c
index 7252b0c9a34bd0d90edd6f78b8f2212135f80549..0ddd8d401ea553310776285422f834fdc8843f19 100644 (file)
--- a/citadel/imap_misc.c
+++ b/citadel/imap_misc.c
@@ -70,7 +70,9 @@ int imap_do_copy(char *destination_folder) {
                for (i = 0; i < IMAP->num_msgs; ++i) {
                        if (IMAP->flags[i] & IMAP_SELECTED) {
                                CtdlCopyMsgToRoom(
-                                       IMAP->msgids[i], roomname);
+                                       IMAP->msgids[i],
+                                       roomname
+                               );
                        }
                }
        }
@@ -217,13 +219,12 @@ void imap_do_append_flags(long new_msgnum, char *new_message_flags) {
        int i;
 
        if (new_message_flags == NULL) return;
+       if (strlen(new_message_flags) == 0) return;
 
        safestrncpy(flags, new_message_flags, sizeof flags);
-       stripallbut(flags, '(', ')');
 
        for (i=0; i<num_tokens(flags, ' '); ++i) {
-               extract_token(this_flag, flags, i, ' ');
-               lprintf(CTDL_DEBUG, "setting flag <%s>\n", this_flag);
+               extract_token(this_flag, flags, i, ' ', sizeof this_flag);
                if (this_flag[0] == '\\') strcpy(this_flag, &this_flag[1]);
                if (!strcasecmp(this_flag, "Seen")) {
                        CtdlSetSeen(new_msgnum, 1, ctdlsetseen_seen);
@@ -245,13 +246,12 @@ void imap_append(int num_parms, char *parms[]) {
        struct CtdlMessage *msg;
        long new_msgnum = (-1L);
        int ret = 0;
-       size_t blksize;
        char roomname[ROOMNAMELEN];
        char buf[SIZ];
        char savedroom[ROOMNAMELEN];
        int msgs, new;
        int i;
-       char *new_message_flags = NULL;
+       char new_message_flags[SIZ];
 
        if (num_parms < 4) {
                cprintf("%s BAD usage error\r\n", parms[0]);
@@ -264,8 +264,13 @@ void imap_append(int num_parms, char *parms[]) {
                return;
        }
 
+       strcpy(new_message_flags, "");
        if (num_parms >= 5) {
-               new_message_flags = parms[3];
+               for (i=3; i<num_parms; ++i) {
+                       strcat(new_message_flags, parms[i]);
+                       strcat(new_message_flags, " ");
+               }
+               stripallbut(new_message_flags, '(', ')');
        }
 
        /* This is how we'd do this if it were relevant in our data store.
@@ -293,22 +298,9 @@ void imap_append(int num_parms, char *parms[]) {
 
        bytes_transferred = 0;
 
-       do {
-               blksize = literal_length - bytes_transferred;
-               if (blksize > SIZ) blksize = SIZ;
-
-               flush_output();
-               ret = client_read(&IMAP->transmitted_message[bytes_transferred],
-                        blksize);
-               if (ret < 1) {
-                       bytes_transferred = literal_length;     /* bail out */
-               }
-               else {
-                       bytes_transferred += blksize;           /* keep going */
-               }
-       } while (bytes_transferred < literal_length);
-
+       ret = client_read(IMAP->transmitted_message, literal_length);
        IMAP->transmitted_message[literal_length] = 0;
+
        if (ret != 1) {
                cprintf("%s NO Read failed.\r\n", parms[0]);
                return;
@@ -321,10 +313,12 @@ void imap_append(int num_parms, char *parms[]) {
        client_getln(buf, sizeof buf);
 
        /* Convert RFC822 newlines (CRLF) to Unix newlines (LF) */
+       lprintf(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];
+                       IMAP->transmitted_message[stripped_length++] =
+                               IMAP->transmitted_message[i];
                }
        }
        literal_length = stripped_length;