/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2007 DINH Viet Hoa and the Claws Mail team
+ * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#ifdef HAVE_LIBETPAN
+#include <glib.h>
+#include <glib/gi18n.h>
#include "imap-thread.h"
#include <imap.h>
#include <sys/types.h>
#include <gtk/gtk.h>
#include <log.h>
#include "etpan-thread-manager.h"
+#include "etpan-ssl.h"
#include "utils.h"
#include "mainwindow.h"
+#include "ssl.h"
#include "ssl_certificate.h"
#include "socket.h"
#include "remotefolder.h"
+#include "tags.h"
#define DISABLE_LOG_DURING_LOGIN
static void delete_imap(Folder *folder, mailimap *imap)
{
chashdatum key;
- chashdatum value;
key.data = &folder;
key.len = sizeof(folder);
- value.data = imap;
- value.len = 0;
chash_delete(session_hash, &key, NULL);
key.data = &imap;
GIOCondition condition,
gpointer data)
{
+#ifdef G_OS_WIN32
+ gsize bytes_read;
+ gchar ch;
+
+ if (condition & G_IO_IN)
+ g_io_channel_read_chars(source, &ch, 1, &bytes_read, NULL);
+#endif
etpan_thread_manager_loop(thread_manager);
return TRUE;
fd_thread_manager = etpan_thread_manager_get_fd(thread_manager);
+#ifndef G_OS_WIN32
io_channel = g_io_channel_unix_new(fd_thread_manager);
-
+#else
+ io_channel = g_io_channel_win32_new_fd(fd_thread_manager);
+#endif
thread_manager_signal = g_io_add_watch_full(io_channel, 0, G_IO_IN,
thread_manager_event,
(gpointer) NULL,
mailstream_network_delay.tv_usec = 0;
}
-void imap_main_done(void)
+void imap_main_done(gboolean have_connectivity)
{
- imap_disconnect_all();
+ imap_disconnect_all(have_connectivity);
etpan_thread_manager_stop(thread_manager);
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
return;
struct etpan_thread * thread;
chashdatum key;
chashdatum value;
-
+ int r;
+
key.data = &folder;
key.len = sizeof(folder);
-
- chash_get(imap_hash, &key, &value);
+
+ r = chash_get(imap_hash, &key, &value);
+ if (r < 0)
+ return NULL;
+
thread = value.data;
-
+
return thread;
}
struct connect_param {
mailimap * imap;
+ PrefsAccount *account;
const char * server;
int port;
};
value.data = imap;
value.len = 0;
chash_set(session_hash, &key, &value, NULL);
-
+
param.imap = imap;
param.server = server;
param.port = port;
-
+
refresh_resolvers();
threaded_run(folder, ¶m, &result, connect_run);
-
+
debug_print("connect ok %i with imap %p\n", result.error, imap);
-
- return result.error;
-}
-static int etpan_certificate_check(const unsigned char *certificate, int len, void *data)
-{
-#ifdef USE_OPENSSL
- struct connect_param *param = (struct connect_param *)data;
- X509 *cert = NULL;
-
- if (certificate == NULL || len < 0) {
- g_warning("no cert presented.\n");
- return 0;
- }
- cert = d2i_X509(NULL, (const unsigned char **)&certificate, len);
- if (cert == NULL) {
- g_warning("IMAP: can't get cert\n");
- return 0;
- } else if (ssl_certificate_check(cert, NULL,
- (gchar *)param->server, (gushort)param->port) == TRUE) {
- X509_free(cert);
- return 0;
- } else {
- X509_free(cert);
- return -1;
- }
-#elif USE_GNUTLS
- struct connect_param *param = (struct connect_param *)data;
- gnutls_x509_crt cert = NULL;
- gnutls_datum tmp;
-
- if (certificate == NULL || len < 0) {
- g_warning("no cert presented.\n");
- return 0;
- }
-
- tmp.data = malloc(len);
- memcpy(tmp.data, certificate, len);
- tmp.size = len;
- gnutls_x509_crt_init(&cert);
- if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) {
- g_warning("IMAP: can't get cert\n");
- return 0;
- } else if (ssl_certificate_check(cert, (guint)-1, NULL,
- (gchar *)param->server, (gushort)param->port) == TRUE) {
- gnutls_x509_crt_deinit(cert);
- return 0;
- } else {
- gnutls_x509_crt_deinit(cert);
- return -1;
- }
-#endif
- return 0;
+ return result.error;
}
-
+#ifdef USE_GNUTLS
static void connect_ssl_run(struct etpan_thread_op * op)
{
int r;
CHECK_IMAP();
- r = mailimap_ssl_connect(param->imap,
- param->server, param->port);
+ r = mailimap_ssl_connect_with_callback(param->imap,
+ param->server, param->port,
+ etpan_connect_ssl_context_cb, param->account);
result->error = r;
}
chashdatum key;
chashdatum value;
mailimap * imap, * oldimap;
- unsigned char *certificate = NULL;
- int cert_len;
-
+ gboolean accept_if_valid = FALSE;
+
oldimap = get_imap(folder);
imap = mailimap_new(0, NULL);
-
+
if (oldimap) {
debug_print("deleting old imap %p\n", oldimap);
delete_imap(folder, oldimap);
value.data = imap;
value.len = 0;
chash_set(session_hash, &key, &value, NULL);
-
+
param.imap = imap;
param.server = server;
param.port = port;
-
+ param.account = folder->account;
+
+ if (folder->account)
+ accept_if_valid = folder->account->ssl_certs_auto_accept;
+
refresh_resolvers();
threaded_run(folder, ¶m, &result, connect_ssl_run);
if ((result.error == MAILIMAP_NO_ERROR_AUTHENTICATED ||
result.error == MAILIMAP_NO_ERROR_NON_AUTHENTICATED) && !etpan_skip_ssl_cert_check) {
- cert_len = (int)mailstream_ssl_get_certificate(imap->imap_stream, &certificate);
- if (etpan_certificate_check(certificate, cert_len, ¶m) < 0)
- return -1;
- if (certificate)
- free(certificate);
+ if (etpan_certificate_check(imap->imap_stream, server, port,
+ accept_if_valid) != TRUE)
+ result.error = MAILIMAP_ERROR_SSL;
}
debug_print("connect %d with imap %p\n", result.error, imap);
-
+
return result.error;
}
-
+#endif
struct capa_param {
mailimap * imap;
};
}
-struct mailimap_capability_data * imap_threaded_capability(Folder *folder, int *ok)
+int imap_threaded_capability(Folder *folder, struct mailimap_capability_data ** caps)
{
struct capa_param param;
struct capa_result result;
debug_print("capa %d\n", result.error);
- if (ok)
- *ok = result.error;
+ if (result.error == MAILIMAP_NO_ERROR)
+ *caps = result.caps;
- return result.caps;
+ return result.error;
}
return result.error;
}
-
+#ifdef USE_GNUTLS
struct starttls_result {
int error;
};
return;
}
- tls_low = mailstream_low_tls_open(fd);
+ tls_low = mailstream_low_tls_open_with_callback(fd, etpan_connect_ssl_context_cb, param->account);
if (tls_low == NULL) {
debug_print("imap starttls run - can't tls_open\n");
result->error = MAILIMAP_ERROR_STREAM;
{
struct connect_param param;
struct starttls_result result;
- int cert_len;
- unsigned char *certificate;
-
+ gboolean accept_if_valid = FALSE;
+
debug_print("imap starttls - begin\n");
-
+
param.imap = get_imap(folder);
param.server = host;
param.port = port;
-
+ param.account = folder->account;
+
+ if (folder->account)
+ accept_if_valid = folder->account->ssl_certs_auto_accept;
+
threaded_run(folder, ¶m, &result, starttls_run);
-
+
debug_print("imap starttls - end\n");
if (result.error == 0 && param.imap && !etpan_skip_ssl_cert_check) {
- cert_len = (int)mailstream_ssl_get_certificate(param.imap->imap_stream, &certificate);
- if (etpan_certificate_check(certificate, cert_len, ¶m) < 0)
- result.error = MAILIMAP_ERROR_STREAM;
- if (certificate)
- free(certificate);
+ if (etpan_certificate_check(param.imap->imap_stream, host, port,
+ accept_if_valid) != TRUE)
+ return MAILIMAP_ERROR_SSL;
}
return result.error;
}
-
-
+#endif
struct create_param {
mailimap * imap;
if (imap->imap_selection_info->sel_perm_flags) {
GSList *t_flags = NULL;
- clistiter *cur =
- clist_begin(imap->imap_selection_info->sel_perm_flags);
+ clistiter *cur = NULL;
+ if (imap->imap_selection_info->sel_perm_flags)
+ cur = clist_begin(imap->imap_selection_info->sel_perm_flags);
+
for (; cur; cur = clist_next(cur)) {
struct mailimap_flag_perm *flag = (struct mailimap_flag_perm *)clist_content(cur);
if (flag->fl_type == MAILIMAP_FLAG_PERM_ALL)
flag->fl_flag->fl_type == 6 &&
!strcmp(flag->fl_flag->fl_data.fl_extension, "*"))
*can_create_flags = TRUE;
- if (ok_flags) {
+ if (flag->fl_flag && ok_flags) {
MsgPermFlags c_flag = 0;
switch (flag->fl_flag->fl_type) {
case MAILIMAP_FLAG_ANSWERED:
c_flag = IMAP_FLAG_SEEN;
break;
case MAILIMAP_FLAG_KEYWORD:
- if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, "$Forwarded"))
+ if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_FORWARDED))
c_flag = IMAP_FLAG_FORWARDED;
+ if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_JUNK))
+ c_flag = IMAP_FLAG_SPAM;
+ if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_NON_JUNK) ||
+ !strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_NO_JUNK) ||
+ !strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_NOT_JUNK))
+ c_flag = IMAP_FLAG_HAM;
break;
default:
break;
struct search_param {
mailimap * imap;
int type;
+ const char *charset;
struct mailimap_set * set;
+ IMAPSearchKey* key;
};
struct search_result {
static struct mailimap_set *sc_mailimap_set_copy(struct mailimap_set *orig)
{
clist *list = orig ? orig->set_list : NULL;
- clist *newlist = clist_new();
+ clist *newlist;
clistiter *cur;
-
+
if (!orig)
return NULL;
- for (cur = clist_begin(list); cur; cur = clist_next(cur))
- clist_append(newlist,
+
+ newlist = clist_new();
+ if (!newlist)
+ return NULL;
+
+ for (cur = clist_begin(list); cur; cur = clist_next(cur)) {
+ if (clist_append(newlist,
sc_mailimap_set_item_copy(
- (struct mailimap_set_item *)clist_content(cur)));
+ (struct mailimap_set_item *)clist_content(cur))) != 0) {
+ clist_free(newlist);
+ return NULL;
+ }
+ }
return mailimap_set_new(newlist);
}
int r;
struct mailimap_search_key * key = NULL;
struct mailimap_search_key * uid_key = NULL;
- struct mailimap_search_key * search_type_key;
+ struct mailimap_search_key * search_type_key = NULL;
clist * search_result;
-
+
param = op->param;
result = op->result;
} 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:
search_type_key = NULL;
break;
-
case IMAP_SEARCH_TYPE_SEEN:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_SEEN,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_READ, NULL, NULL, 0);
break;
-
case IMAP_SEARCH_TYPE_UNSEEN:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_UNSEEN,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_UNREAD, NULL, NULL, 0);
break;
-
case IMAP_SEARCH_TYPE_ANSWERED:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_ANSWERED,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_REPLIED, NULL, NULL, 0);
break;
-
case IMAP_SEARCH_TYPE_FLAGGED:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_FLAGGED,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_MARKED, NULL, NULL, 0);
break;
case IMAP_SEARCH_TYPE_DELETED:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_DELETED,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_DELETED, NULL, NULL, 0);
break;
case IMAP_SEARCH_TYPE_FORWARDED:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_KEYWORD,
- NULL, NULL, NULL, NULL, NULL,
- strdup("$Forwarded"), NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, RTAG_FORWARDED, 0);
+ break;
+ case IMAP_SEARCH_TYPE_SPAM:
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, RTAG_JUNK, 0);
+ break;
+ case IMAP_SEARCH_TYPE_KEYED:
+ search_type_key = param->key;
break;
}
} else {
mailstream_logger = imap_logger_uid;
- r = mailimap_uid_search(param->imap, NULL, key, &search_result);
+ r = mailimap_uid_search(param->imap, param->charset, key, &search_result);
mailstream_logger = imap_logger_cmd;
debug_print("imap search run - end %i\n", result->error);
}
-int imap_threaded_search(Folder * folder, int search_type,
- struct mailimap_set * set, clist ** search_result)
+int imap_threaded_search(Folder * folder, int search_type, IMAPSearchKey* key,
+ const char *charset, struct mailimap_set * set,
+ clist ** search_result)
{
struct search_param param;
struct search_result result;
imap = get_imap(folder);
param.imap = imap;
param.set = set;
+ param.charset = charset;
param.type = search_type;
-
+ param.key = key;
+
threaded_run(folder, ¶m, &result, search_run);
if (result.error != MAILIMAP_NO_ERROR)
}
+struct _IMAPSearchKey {
+ struct mailimap_search_key* key;
+};
+
+IMAPSearchKey* imap_search_new(gint criteria,
+ const gchar *header,
+ const gchar *expr,
+ int value)
+{
+ char* sk_bcc = NULL;
+ struct mailimap_date* sk_before = NULL;
+ char* sk_body = NULL;
+ char* sk_cc = NULL;
+ char* sk_from = NULL;
+ char* sk_keyword = NULL;
+ struct mailimap_date* sk_on = NULL;
+ struct mailimap_date* sk_since = NULL;
+ char* sk_subject = NULL;
+ char* sk_text = NULL;
+ char* sk_to = NULL;
+ char* sk_unkeyword = NULL;
+ char* sk_header_name = NULL;
+ char* sk_header_value = NULL;
+ uint32_t sk_larger = 0;
+ struct mailimap_search_key* sk_not = NULL;
+ struct mailimap_search_key* sk_or1 = NULL;
+ struct mailimap_search_key* sk_or2 = NULL;
+ struct mailimap_date* sk_sentbefore = NULL;
+ struct mailimap_date* sk_senton = NULL;
+ struct mailimap_date* sk_sentsince = NULL;
+ uint32_t sk_smaller = 0;
+ struct mailimap_set* sk_uid = NULL;
+ struct mailimap_set* sk_set = NULL;
+ clist* sk_multiple = NULL;
+ int etpan_matcher_type;
+
+ switch (criteria) {
+ case IMAP_SEARCH_CRITERIA_ALL: etpan_matcher_type = MAILIMAP_SEARCH_KEY_ALL; break;
+ case IMAP_SEARCH_CRITERIA_READ: etpan_matcher_type = MAILIMAP_SEARCH_KEY_SEEN; break;
+ case IMAP_SEARCH_CRITERIA_UNREAD: etpan_matcher_type = MAILIMAP_SEARCH_KEY_UNSEEN; break;
+ case IMAP_SEARCH_CRITERIA_NEW: etpan_matcher_type = MAILIMAP_SEARCH_KEY_NEW; break;
+ case IMAP_SEARCH_CRITERIA_MARKED: etpan_matcher_type = MAILIMAP_SEARCH_KEY_FLAGGED; break;
+ case IMAP_SEARCH_CRITERIA_REPLIED: etpan_matcher_type = MAILIMAP_SEARCH_KEY_ANSWERED; break;
+ case IMAP_SEARCH_CRITERIA_DELETED: etpan_matcher_type = MAILIMAP_SEARCH_KEY_DELETED; break;
+
+ case IMAP_SEARCH_CRITERIA_TAG:
+ sk_keyword = strdup(expr);
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_KEYWORD;
+ break;
+
+ case IMAP_SEARCH_CRITERIA_SUBJECT:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_SUBJECT;
+ sk_subject = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_TO:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_TO;
+ sk_to = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_CC:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_CC;
+ sk_cc = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_AGE_GREATER:
+ case IMAP_SEARCH_CRITERIA_AGE_LOWER:
+ {
+ struct tm tm;
+ time_t limit = time(NULL) - 60 * 60 * 24 * value;
+
+ tzset();
+ localtime_r(&limit, &tm);
+ if (criteria == IMAP_SEARCH_CRITERIA_AGE_GREATER) {
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_SENTBEFORE;
+ sk_sentbefore = mailimap_date_new(tm.tm_mday, tm.tm_mon, tm.tm_year + 1900);
+ } else {
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_SENTSINCE;
+ sk_sentsince = mailimap_date_new(tm.tm_mday, tm.tm_mon, tm.tm_year + 1900);
+ }
+ break;
+ }
+
+ case IMAP_SEARCH_CRITERIA_BODY:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_BODY;
+ sk_body = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_MESSAGE:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_TEXT;
+ sk_text = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_HEADER:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_HEADER;
+ sk_header_name = strdup(header);
+ sk_header_value = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_FROM:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_FROM;
+ sk_from = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_SIZE_GREATER:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_LARGER;
+ sk_larger = value;
+ break;
+
+ case IMAP_SEARCH_CRITERIA_SIZE_SMALLER:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_SMALLER;
+ sk_smaller = value;
+ break;
+
+ default:
+ return NULL;
+ }
+
+ return mailimap_search_key_new(etpan_matcher_type,
+ sk_bcc, sk_before, sk_body, sk_cc, sk_from, sk_keyword,
+ sk_on, sk_since, sk_subject, sk_text, sk_to,
+ sk_unkeyword, sk_header_name,sk_header_value, sk_larger,
+ sk_not, sk_or1, sk_or2, sk_sentbefore, sk_senton,
+ sk_sentsince, sk_smaller, sk_uid, sk_set, sk_multiple);
+}
+
+IMAPSearchKey* imap_search_not(IMAPSearchKey* key)
+{
+ return mailimap_search_key_new_not(key);
+}
+
+IMAPSearchKey* imap_search_or(IMAPSearchKey* l, IMAPSearchKey* r)
+{
+ return mailimap_search_key_new_or(l, r);
+}
+
+IMAPSearchKey* imap_search_and(IMAPSearchKey* l, IMAPSearchKey* r)
+{
+ IMAPSearchKey* result = mailimap_search_key_new_multiple_empty();
+ mailimap_search_key_multiple_add(result, l);
+ mailimap_search_key_multiple_add(result, r);
+
+ return result;
+}
+
+void imap_search_free(IMAPSearchKey* key)
+{
+ if (!key)
+ return;
+
+ mailimap_search_key_free(key);
+}
+
+
static int imap_get_msg_att_info(struct mailimap_msg_att * msg_att,
uint32_t * puid,
static int
result_to_uid_list(clist * fetch_result, carray ** result)
{
- clistiter * cur;
+ clistiter * cur = NULL;
int r;
int res;
carray * tab;
goto err;
}
- for(cur = clist_begin(fetch_result) ; cur != NULL ;
- cur = clist_next(cur)) {
+ if (fetch_result)
+ cur = clist_begin(fetch_result);
+
+ for(; cur != NULL ; cur = clist_next(cur)) {
struct mailimap_msg_att * msg_att;
uint32_t uid;
uint32_t * puid;
static int
result_to_uid_flags_list(clist * fetch_result, carray ** result)
{
- clistiter * cur;
+ clistiter * cur = NULL;
int r;
int res;
carray * tab;
res = MAILIMAP_ERROR_MEMORY;
goto err;
}
-
- for(cur = clist_begin(fetch_result) ; cur != NULL ;
- cur = clist_next(cur)) {
+
+ if (fetch_result)
+ cur = clist_begin(fetch_result);
+
+ for(; cur != NULL ; cur = clist_next(cur)) {
struct mailimap_msg_att * msg_att;
uint32_t uid;
uint32_t * puid;
free_list:
imap_fetch_uid_flags_list_free(tab);
- slist_free_strings(tags);
- g_slist_free(tags);
+ slist_free_strings_full(tags);
err:
return res;
}
return r;
}
- if (clist_begin(fetch_result) == NULL) {
+ if (fetch_result == NULL || clist_begin(fetch_result) == NULL) {
mailimap_fetch_list_free(fetch_result);
return MAILIMAP_ERROR_FETCH;
}
text = NULL;
text_length = 0;
- for(cur = clist_begin(msg_att->att_list) ; cur != NULL ;
- cur = clist_next(cur)) {
+ if (msg_att->att_list)
+ cur = clist_begin(msg_att->att_list);
+ else
+ cur = NULL;
+
+ for(; cur != NULL ; cur = clist_next(cur)) {
msg_att_item = clist_content(cur);
if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
return r;
}
- if (clist_begin(fetch_result) == NULL) {
+ if (fetch_result == NULL || clist_begin(fetch_result) == NULL) {
mailimap_fetch_list_free(fetch_result);
return MAILIMAP_ERROR_FETCH;
}
text = NULL;
text_length = 0;
- for(cur = clist_begin(msg_att->att_list) ; cur != NULL ;
- cur = clist_next(cur)) {
+ if (msg_att->att_list)
+ cur = clist_begin(msg_att->att_list);
+ else
+ cur = NULL;
+
+ for(; cur != NULL ; cur = clist_next(cur)) {
msg_att_item = clist_content(cur);
if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
result->error = r;
if (r == MAILIMAP_NO_ERROR) {
- fd = open(param->filename, O_RDWR | O_CREAT, 0600);
+ fd = g_open(param->filename, O_RDWR | O_CREAT, 0600);
if (fd < 0) {
result->error = MAILIMAP_ERROR_FETCH;
goto free;
flags &= ~MSG_NEW;
break;
case MAILIMAP_FLAG_KEYWORD:
- if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, "$Forwarded"))
+ if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_FORWARDED))
flags |= MSG_FORWARDED;
+ else if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_JUNK))
+ flags |= MSG_SPAM;
+ else if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_NON_JUNK) ||
+ !strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_NO_JUNK) ||
+ !strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_NOT_JUNK))
+ flags &= ~MSG_SPAM;
else if (s_tags)
tags = g_slist_prepend(tags, g_strdup(flag_fetch->fl_flag->fl_data.fl_keyword));
break;
ref_size = 0;
att_dyn = NULL;
- for(item_cur = clist_begin(msg_att->att_list) ; item_cur != NULL ;
- item_cur = clist_next(item_cur)) {
+ if (msg_att->att_list)
+ item_cur = clist_begin(msg_att->att_list);
+ else
+ item_cur = NULL;
+ for(; item_cur != NULL ; item_cur = clist_next(item_cur)) {
struct mailimap_msg_att_item * item;
item = clist_content(item_cur);
carray ** p_env_list)
{
clistiter * cur;
- unsigned int i;
- carray * env_list;
- i = 0;
- env_list = carray_new(16);
-
- for(cur = clist_begin(fetch_result) ; cur != NULL ;
- cur = clist_next(cur)) {
- struct mailimap_msg_att * msg_att;
- struct imap_fetch_env_info * env_info;
- GSList *tags = NULL;
+ if (fetch_result) {
+ carray * env_list;
+ env_list = carray_new(16);
- msg_att = clist_content(cur);
+ for(cur = clist_begin(fetch_result) ; cur != NULL ;
+ cur = clist_next(cur)) {
+ struct mailimap_msg_att * msg_att;
+ struct imap_fetch_env_info * env_info;
+ GSList *tags = NULL;
+
+ msg_att = clist_content(cur);
- env_info = fetch_to_env_info(msg_att, &tags);
- if (!env_info)
- return MAILIMAP_ERROR_MEMORY;
- carray_add(env_list, env_info, NULL);
- carray_add(env_list, tags, NULL);
+ env_info = fetch_to_env_info(msg_att, &tags);
+ if (!env_info
+ || carray_add(env_list, env_info, NULL) != 0
+ || carray_add(env_list, tags, NULL) != 0) {
+ carray_free(env_list);
+ return MAILIMAP_ERROR_MEMORY;
+ }
+ }
+ * p_env_list = env_list;
+ } else {
+ * p_env_list = NULL;
}
-
- * p_env_list = env_list;
-
+
return MAIL_NO_ERROR;
}
static int imap_add_envelope_fetch_att(struct mailimap_fetch_type * fetch_type)
{
struct mailimap_fetch_att * fetch_att;
- int r;
+ int i;
char * header;
clist * hdrlist;
struct mailimap_header_list * imap_hdrlist;
struct mailimap_section * section;
+ char *headers[] = {
+ "Date", "From", "To", "Cc", "Subject", "Message-ID",
+ "References", "In-Reply-To", NULL
+ };
hdrlist = clist_new();
-
- header = strdup("Date");
- r = clist_append(hdrlist, header);
- header = strdup("From");
- r = clist_append(hdrlist, header);
- header = strdup("To");
- r = clist_append(hdrlist, header);
- header = strdup("Cc");
- r = clist_append(hdrlist, header);
- header = strdup("Subject");
- r = clist_append(hdrlist, header);
- header = strdup("Message-ID");
- r = clist_append(hdrlist, header);
- header = strdup("References");
- r = clist_append(hdrlist, header);
- header = strdup("In-Reply-To");
- r = clist_append(hdrlist, header);
-
+ if (!hdrlist)
+ return MAIL_ERROR_MEMORY;
+ i = 0;
+ while (headers[i] != NULL) {
+ header = strdup(headers[i]);
+ if (header == NULL || clist_append(hdrlist, header) != 0) {
+ clist_free(hdrlist);
+ return MAIL_ERROR_MEMORY;
+ }
+ ++i;
+ }
+
imap_hdrlist = mailimap_header_list_new(hdrlist);
section = mailimap_section_new_header_fields(imap_hdrlist);
fetch_att = mailimap_fetch_att_new_body_peek_section(section);
mailimap_fetch_type_new_fetch_att_list_add(fetch_type, fetch_att);
-
+
return MAIL_NO_ERROR;
}
return r;
}
- if (clist_begin(fetch_result) == NULL) {
+ if (fetch_result == NULL || clist_begin(fetch_result) == NULL) {
res = MAILIMAP_ERROR_FETCH;
debug_print("clist_begin = NULL\n");
goto err;
}
size = stat_buf.st_size;
- fd = open(param->filename, O_RDONLY);
+ fd = g_open(param->filename, O_RDONLY, 0);
if (fd < 0) {
result->error = MAILIMAP_ERROR_APPEND;
return;
/* Detach from the controlling tty if we have one. Otherwise,
SSH might do something stupid like trying to use it instead
of running $SSH_ASKPASS. Doh. */
- fd = open("/dev/tty", O_RDONLY);
+ fd = g_open("/dev/tty", O_RDONLY, 0);
if (fd != -1) {
ioctl(fd, TIOCNOTTY, NULL);
close(fd);
void imap_main_init(void)
{
}
-void imap_main_done(void)
+void imap_main_done(gboolean have_connectivity)
{
}
void imap_main_set_timeout(int sec)
projects / claws.git / blobdiff