2006-11-02 [colin] 2.5.6cvs19

[claws.git] / src / etpan / imap-thread.c

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 0ee012d502bc0f607dc3294af8d1c4223c19792a..99c19197a35e82acefe42faa9cf451a7515cefac 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -8,7 +8,7 @@
 #include <imap.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__CYGWIN__))
+#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__))
 #include <sys/socket.h>
 #endif
 #include <fcntl.h>
@@ -41,7 +41,7 @@ static gboolean thread_manager_event(GIOChannel * source,
        return TRUE;
 }
 
-void imap_logger_cmd(int direction, const char * str, size_t size) 
+static void imap_logger_cmd(int direction, const char * str, size_t size) 
 {
        gchar *buf;
        gchar **lines;
@@ -72,7 +72,7 @@ void imap_logger_cmd(int direction, const char * str, size_t size)
        free(buf);
 }
 
-void imap_logger_fetch(int direction, const char * str, size_t size) 
+static void imap_logger_fetch(int direction, const char * str, size_t size) 
 {
        gchar *buf;
        gchar **lines;
@@ -106,6 +106,44 @@ void imap_logger_fetch(int direction, const char * str, size_t size)
        free(buf);
 }
 
+static void imap_logger_uid(int direction, const char * str, size_t size) 
+{
+       gchar *buf;
+       gchar **lines;
+       int i = 0;
+
+       buf = malloc(size+1);
+       memset(buf, 0, size+1);
+       strncpy(buf, str, size);
+       buf[size] = '\0';
+       if (!strncmp(buf, "<<<<<<<", 7) 
+       ||  !strncmp(buf, ">>>>>>>", 7)) {
+               free(buf);
+               return;
+       }
+       while (strstr(buf, "\r"))
+               *strstr(buf, "\r") = ' ';
+       while (strlen(buf) > 0 && buf[strlen(buf)-1] == '\n')
+               buf[strlen(buf)-1] = '\0';
+
+       lines = g_strsplit(buf, "\n", -1);
+
+       while (lines[i] && *lines[i]) {
+               int llen = strlen(lines[i]);
+               if (llen < 64)
+                       log_print("IMAP4%c %s\n", direction?'>':'<', lines[i]);
+               else {
+                       gchar tmp[64];
+                       strncpy2(tmp, lines[i], 63);
+                       log_print("IMAP4%c %s[... - %zd bytes more]\n", direction?'>':'<', tmp,
+                                 llen-64);
+               }
+               i++;
+       }
+       g_strfreev(lines);
+       free(buf);
+}
+
 void imap_logger_append(int direction, const char * str, size_t size) 
 {
        gchar *buf;
@@ -380,7 +418,7 @@ static int etpan_certificate_check(const unsigned char *certificate, int len, vo
        if (cert == NULL) {
                g_warning("can't get cert\n");
                return 0;
-       } else if (ssl_certificate_check(cert, 
+       } else if (ssl_certificate_check(cert, NULL,
                (gchar *)param->server, (gushort)param->port) == TRUE) {
                X509_free(cert);
                return 0;
@@ -470,7 +508,7 @@ static void capability_run(struct etpan_thread_op * op)
 }
 
 
-struct mailimap_capability_data * imap_threaded_capability(Folder *folder)
+struct mailimap_capability_data * imap_threaded_capability(Folder *folder, int *ok)
 {
        struct capa_param param;
        struct capa_result result;
@@ -482,8 +520,11 @@ struct mailimap_capability_data * imap_threaded_capability(Folder *folder)
        
        threaded_run(folder, &param, &result, capability_run);
        
-       debug_print("capa ok\n");
+       debug_print("capa %d\n", result.error);
        
+       if (ok)
+               *ok = result.error;
+
        return result.caps;
        
 }
@@ -602,6 +643,7 @@ struct login_param {
        const char * login;
        const char * password;
        const char * type;
+       const char * server;
 };
 
 struct login_result {
@@ -626,6 +668,11 @@ static void login_run(struct etpan_thread_op * op)
        if (!strcmp(param->type, "LOGIN"))
                r = mailimap_login(param->imap,
                           param->login, param->password);
+       else if (!strcmp(param->type, "GSSAPI"))
+               r = mailimap_authenticate(param->imap,
+                       param->type, param->server, NULL, NULL,
+                       param->login, param->login,
+                       param->password, NULL);
        else 
                r = mailimap_authenticate(param->imap,
                        param->type, NULL, NULL, NULL,
@@ -653,6 +700,10 @@ int imap_threaded_login(Folder * folder,
        param.login = login;
        param.password = password;
        param.type = type;
+       if (folder && folder->account)
+               param.server = folder->account->recv_server;
+       else
+               param.server = NULL;
 
        threaded_run(folder, &param, &result, login_run);
        
@@ -1146,14 +1197,12 @@ static void search_run(struct etpan_thread_op * op)
        
        param = op->param;
        
-       if (param->set == NULL && param->type == IMAP_SEARCH_TYPE_SIMPLE) {
-               g_warning("broken search");
-       }
-       
        /* we copy the mailimap_set because freeing the key is recursive */
-       if (param->set != NULL)
+       if (param->set != NULL) {
                uid_key = mailimap_search_key_new_uid(sc_mailimap_set_copy(param->set));
-       
+       } else if (param->type == IMAP_SEARCH_TYPE_SIMPLE) {
+               uid_key = mailimap_search_key_new_all();
+       }
        search_type_key = NULL;
        switch (param->type) {
        case IMAP_SEARCH_TYPE_SIMPLE:
@@ -1223,8 +1272,12 @@ static void search_run(struct etpan_thread_op * op)
                result->error = -1;
                result->search_result = NULL;
        } else {
+               mailstream_logger = imap_logger_uid;
+
                r = mailimap_uid_search(param->imap, NULL, key, &search_result);
 
+               mailstream_logger = imap_logger_cmd;
+
                /* free the key (with the imapset) */
                mailimap_search_key_free(key);
 
@@ -2164,7 +2217,8 @@ static void append_run(struct etpan_thread_op * op)
        char * data;
        size_t size;
        struct stat stat_buf;
-       int fd, uid = 0;
+       int fd;
+       guint32 uid = 0, val = 0;
        
        param = op->param;
        result = op->result;
@@ -2191,9 +2245,9 @@ static void append_run(struct etpan_thread_op * op)
        
        mailstream_logger = imap_logger_append;
        
-       r = mailimap_append(param->imap, param->mailbox,
+       r = mailimap_uidplus_append(param->imap, param->mailbox,
                            param->flag_list, NULL,
-                           data, size/*, &uid */);
+                           data, size, &val, &uid);
 
        mailstream_logger = imap_logger_cmd;
        
@@ -2284,6 +2338,8 @@ struct copy_param {
 
 struct copy_result {
        int error;
+       struct mailimap_set *source;
+       struct mailimap_set *dest;
 };
 
 static void copy_run(struct etpan_thread_op * op)
@@ -2291,19 +2347,28 @@ static void copy_run(struct etpan_thread_op * op)
        struct copy_param * param;
        struct copy_result * result;
        int r;
-       
+       guint32 val;
        param = op->param;
+       struct mailimap_set *source = NULL, *dest = NULL;
        
-       r = mailimap_uid_copy(param->imap, param->set, param->mb);
+       r = mailimap_uidplus_uid_copy(param->imap, param->set, param->mb,
+               &val, &source, &dest);
        
        result = op->result;
        result->error = r;
-       
+       if (r == 0) {
+               result->source = source;
+               result->dest = dest;
+       } else {
+               result->source = NULL;
+               result->dest = NULL;
+       }
        debug_print("imap copy run - end %i\n", r);
 }
 
 int imap_threaded_copy(Folder * folder, struct mailimap_set * set,
-                      const char * mb)
+                      const char * mb, struct mailimap_set **source,
+                      struct mailimap_set **dest)
 {
        struct copy_param param;
        struct copy_result result;
@@ -2317,10 +2382,15 @@ int imap_threaded_copy(Folder * folder, struct mailimap_set * set,
        param.mb = mb;
        
        threaded_run(folder, &param, &result, copy_run);
+       *source = NULL;
+       *dest = NULL;
        
        if (result.error != MAILIMAP_NO_ERROR)
                return result.error;
        
+       *source = result.source;
+       *dest = result.dest;
+
        debug_print("imap copy - end\n");
        
        return result.error;