* More IMAP tweaks

[citadel.git] / citadel / imap_tools.c

diff --git a/citadel/imap_tools.c b/citadel/imap_tools.c
index a52c8b50e308f20dfd1de14e52141304b123cfdd..a633cbde46c698b221a8d36c26e56c80f6fa0f15 100644 (file)
--- a/citadel/imap_tools.c
+++ b/citadel/imap_tools.c
@@ -7,12 +7,45 @@
 
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 #include "citadel.h"
+#include "sysdep_decls.h"
 #include "tools.h"
 #include "imap_tools.h"
 
+
+/*
+ * Output a string to the IMAP client, either as a literal or quoted.
+ * (We do a literal if it has any double-quotes or backslashes.)
+ */
+void imap_strout(char *buf) {
+       int i;
+       int is_literal = 0;
+
+       if (buf == NULL) {              /* yeah, we handle this */
+               cprintf("NIL");
+               return;
+       }
+
+       for (i=0; i<strlen(buf); ++i) {
+               if ( (buf[i]=='\"') || (buf[i]=='\\') ) is_literal = 1;
+       }
+
+       if (is_literal) {
+               cprintf("{%d}\r\n%s", strlen(buf), buf);
+       }
+
+       else {
+               cprintf("\"%s\"", buf);
+       }
+}
+
+       
+
+
+
 /*
  * Break a command down into tokens, taking into consideration the
  * possibility of escaping spaces using quoted tokens
@@ -66,20 +99,3 @@ void imap_mailboxname(char *buf, int bufsize, struct quickroom *qrbuf) {
        }
 }
 
-
-/*
- * Parse a parenthesized list of items (as with the FETCH command)
- */
-int imap_extract_data_items(char *items) {
-       int num_items = 0;
-       int i;
-
-       /* First, convert all whitespace to ordinary space characters */
-       for (i=0; i<strlen(items); ++i) {
-               if (isspace(items[i])) items[i] = ' ';
-       }
-
-       return num_items;
-}
-
-