gchar last_seen_separator;
guint refcnt;
guint max_set_size;
+ const gchar *search_charset;
+ gboolean search_charset_supported;
};
struct _IMAPSession
gboolean busy;
gboolean cancelled;
gboolean sens_update_block;
+ gboolean do_destroy;
};
struct _IMAPNameSpace
}
}
+static gboolean imap_ping(gpointer data)
+{
+ Session *session = (Session *)data;
+ IMAPSession *imap_session = IMAP_SESSION(session);
+ int r;
+
+ if (session->state != SESSION_READY)
+ return FALSE;
+ if (imap_session->busy || !imap_session->authenticated)
+ return TRUE;
+
+ lock_session(imap_session);
+ r = imap_cmd_noop(imap_session);
+ unlock_session(imap_session);
+
+ return r == MAILIMAP_NO_ERROR;
+}
+
static void imap_disc_session_destroy(IMAPSession *session)
{
RemoteFolder *rfolder = NULL;
SESSION(session)->sock = NULL;
}
+static void imap_safe_destroy(IMAPSession *session)
+{
+ if (!session->busy)
+ session_destroy(SESSION(session));
+ else
+ session->do_destroy = TRUE;
+}
+
static gboolean is_fatal(int libetpan_errcode)
{
switch(libetpan_errcode) {
while (imap_folder_get_refcnt(folder) > 0)
gtk_main_iteration();
+ g_free(IMAP_FOLDER(folder)->search_charset);
+
folder_remote_folder_destroy(REMOTE_FOLDER(folder));
imap_done(folder);
}
{
folder_remote_folder_init((Folder *)folder, name, path);
IMAP_FOLDER(folder)->max_set_size = IMAP_SET_MAX_COUNT;
+ IMAP_FOLDER(folder)->search_charset_supported = TRUE;
+ IMAP_FOLDER(folder)->search_charset = conv_get_locale_charset_str_no_utf8();
}
static FolderItem *imap_folder_item_new(Folder *folder)
log_warning(LOG_PROTOCOL, _("Connecting to %s failed"),
folder->account->recv_server);
SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
+ imap_safe_destroy(session);
session = NULL;
} else {
rfolder->session = NULL;
folder->account->recv_server);
SESSION(session)->state = SESSION_DISCONNECTED;
SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
+ imap_safe_destroy(session);
/* Clear folders session to make imap_session_get create
a new session, because of rfolder->session == NULL
it will not try to reconnect again and so avoid an
return NULL;
}
+ /* check for deferred destroy */
+ if (rfolder->session != NULL) {
+ session = IMAP_SESSION(rfolder->session);
+ if (!session->busy && session->do_destroy) {
+ rfolder->session = NULL;
+ imap_safe_destroy(session);
+ session = NULL;
+ }
+ }
+
/* Make sure we have a session */
if (rfolder->session != NULL && rfolder->session->state != SESSION_DISCONNECTED) {
session = IMAP_SESSION(rfolder->session);
} else if (rfolder->session != NULL && rfolder->session->state == SESSION_DISCONNECTED) {
- session_destroy(SESSION(rfolder->session));
+ imap_safe_destroy(IMAP_SESSION(rfolder->session));
rfolder->session = NULL;
goto new_conn;
} else if (rfolder->connecting) {
imap_threaded_disconnect(session->folder);
SESSION(session)->state = SESSION_DISCONNECTED;
SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
+ imap_safe_destroy(session);
}
rfolder->last_failure = time(NULL);
rfolder->connecting = FALSE;
log_warning(LOG_PROTOCOL, _("Can't start TLS session.\n"));
if (!is_fatal(ok)) {
SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
+ imap_safe_destroy(session);
}
return NULL;
}
log_message(LOG_PROTOCOL, "IMAP connection is %s-authenticated\n",
(session->authenticated) ? "pre" : "un");
+ session_register_ping(SESSION(session), imap_ping);
+
return session;
}
gboolean failed = FALSE;
gint ok = MAILIMAP_NO_ERROR;
g_return_val_if_fail(account->userid != NULL, MAILIMAP_ERROR_BAD_STATE);
- acc_pass = account->passwd;
+
+ if (password_get(account->userid, account->recv_server, "imap",
+ SESSION(session)->port, &pass)) {
+ Xstrdup_a(acc_pass, pass, {g_free(pass); return MAILIMAP_NO_ERROR;});
+ g_free(pass);
+ } else {
+ acc_pass = account->passwd;
+ }
try_again:
pass = acc_pass;
if (!pass && account->imap_auth_type != IMAP_AUTH_ANON && account->imap_auth_type != IMAP_AUTH_GSSAPI) {
if (list_set) {
ok = imap_set_message_flags(session,
IMAP_FOLDER_ITEM(item), &numlist, 0, list_set, TRUE);
- slist_free_strings(list_set);
- g_slist_free(list_set);
+ slist_free_strings_full(list_set);
if (ok != MAILIMAP_NO_ERROR) {
return;
}
if (list_unset) {
ok = imap_set_message_flags(session,
IMAP_FOLDER_ITEM(item), &numlist, 0, list_unset, FALSE);
- slist_free_strings(list_unset);
- g_slist_free(list_unset);
+ slist_free_strings_full(list_unset);
if (ok != MAILIMAP_NO_ERROR) {
return;
}
if (!cached || !MSG_IS_FULLY_CACHED(cached->flags)) {
have_size = get_file_size_with_crs(filename);
if (cached && (cached->size <= have_size || !body)) {
- procmsg_msginfo_free(cached);
ok = file_strip_crs(filename);
if (ok == 0 && cached && cached->size <= have_size) {
/* we have it all and stripped */
- debug_print("...fully cached in fact; setting flag.\n");
+ debug_print("...fully cached in fact (%d/%d); setting flag.\n",
+ have_size, cached->size);
procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
}
+ procmsg_msginfo_free(cached);
return filename;
} else if (!cached && time(NULL) - get_file_mtime(filename) < 60) {
debug_print("message not cached and file recent, considering file complete\n");
return TRUE;
}
path = folder_item_get_path(item);
- if (!is_dir_exist(path))
+ if (!is_dir_exist(path)) {
+ g_free(path);
return FALSE;
+ }
filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(uid), NULL);
g_free(path);
size = get_file_size_with_crs(filename);
g_free(filename);
}
+ debug_print("msg %d cached, has size %d, full should be %d.\n", uid, size, cached->size);
if (cached && size >= cached->size) {
cached->total_size = cached->size;
procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
return ret;
}
+static gboolean imap_matcher_type_is_local(gint matchertype)
+{
+ switch (matchertype) {
+ case MATCHCRITERIA_FROM:
+ case MATCHCRITERIA_TO:
+ case MATCHCRITERIA_CC:
+ case MATCHCRITERIA_TO_OR_CC:
+ case MATCHCRITERIA_SUBJECT:
+ case MATCHCRITERIA_REFERENCES:
+ case MATCHCRITERIA_INREPLYTO:
+ case MATCHCRITERIA_AGE_GREATER:
+ case MATCHCRITERIA_AGE_LOWER:
+ case MATCHCRITERIA_FORWARDED:
+ case MATCHCRITERIA_SPAM:
+ case MATCHCRITERIA_UNREAD:
+ case MATCHCRITERIA_NEW:
+ case MATCHCRITERIA_MARKED:
+ case MATCHCRITERIA_REPLIED:
+ case MATCHCRITERIA_DELETED:
+ case MATCHCRITERIA_SIZE_GREATER:
+ case MATCHCRITERIA_SIZE_SMALLER:
+ case MATCHCRITERIA_SIZE_EQUAL:
+ return TRUE;
+ }
+ return FALSE;
+}
static IMAPSearchKey* search_make_key(MatcherProp* match, gboolean* is_all)
{
* has proven faster than IMAP search plus network roundtrips. once this changes,
* consider removing these exceptions.
*/
- switch (matchertype) {
- case MATCHCRITERIA_FROM:
- case MATCHCRITERIA_TO:
- case MATCHCRITERIA_CC:
- case MATCHCRITERIA_TO_OR_CC:
- case MATCHCRITERIA_SUBJECT:
- case MATCHCRITERIA_REFERENCES:
- case MATCHCRITERIA_INREPLYTO:
- case MATCHCRITERIA_AGE_GREATER:
- case MATCHCRITERIA_AGE_LOWER:
- case MATCHCRITERIA_FORWARDED:
- case MATCHCRITERIA_SPAM:
- case MATCHCRITERIA_UNREAD:
- case MATCHCRITERIA_NEW:
- case MATCHCRITERIA_MARKED:
- case MATCHCRITERIA_REPLIED:
- case MATCHCRITERIA_DELETED:
- case MATCHCRITERIA_SIZE_GREATER:
- case MATCHCRITERIA_SIZE_SMALLER:
- case MATCHCRITERIA_SIZE_EQUAL:
+ if (imap_matcher_type_is_local(matchertype))
return NULL;
- }
/* the Message-ID header is also cached */
if (matchertype == MATCHCRITERIA_HEADER && g_strcmp0("Message-ID", match->header) == 0) {
break;
case MATCHCRITERIA_TAG:
- result = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, match->expr, 0);
+ {
+ gchar *tmp = imap_utf8_to_modified_utf7(match->expr, TRUE);
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, tmp, 0);
+ g_free(tmp);
+ }
break;
case MATCHCRITERIA_SUBJECT:
return NULL;
}
+static void imap_change_search_charset(IMAPFolder *folder)
+{
+ /* If server supports charset in searches, but the last used one failed,
+ * changed to the next preferred charset. If none are still available,
+ * disable charset searches.
+ * Charsets are tried in the following order:
+ * UTF-8, locale's charset, UTF-7.
+ */
+
+ if (folder->search_charset_supported) {
+ if (folder->search_charset && !strcmp(folder->search_charset, conv_get_locale_charset_str_no_utf8()))
+ folder->search_charset = "UTF-8";
+ else if (folder->search_charset && !strcmp(folder->search_charset, "UTF-8"))
+ folder->search_charset = "UTF-7";
+ else {
+ folder->search_charset = NULL;
+ folder->search_charset_supported = FALSE;
+ }
+ }
+}
+
+static MatcherProp *imap_matcher_prop_set_charset(IMAPFolder *folder,
+ MatcherProp *utf8_prop,
+ gchar **charset)
+{
+ /* If the match is going to be done locally, or the criteria is on
+ * tag (special-cased to modified-UTF-7), or the expression searched
+ * is ASCII, don't bother converting.
+ */
+ if (imap_matcher_type_is_local(utf8_prop->criteria)
+ || utf8_prop->criteria == MATCHCRITERIA_TAG
+ || utf8_prop->criteria == MATCHCRITERIA_NOT_TAG
+ || utf8_prop->expr == NULL
+ || is_ascii_str(utf8_prop->expr))
+ return matcherprop_new(utf8_prop->criteria,
+ utf8_prop->header,
+ utf8_prop->matchtype,
+ utf8_prop->expr,
+ utf8_prop->value);
+ else {
+ gchar *conv_expr = NULL;
+
+ /* If the search is server-side and the server doesn't support
+ * searching with the charsets we handle, bail out.
+ */
+ if (folder->search_charset_supported == FALSE)
+ return NULL;
+
+ /* Else, convert. */
+ if (*charset == NULL)
+ *charset = g_strdup(folder->search_charset);
+
+ conv_expr = conv_codeset_strdup(utf8_prop->expr, CS_UTF_8, *charset);
+
+ if (conv_expr == NULL)
+ conv_expr = g_strdup(utf8_prop->expr);
+
+ return matcherprop_new(utf8_prop->criteria,
+ utf8_prop->header,
+ utf8_prop->matchtype,
+ conv_expr,
+ utf8_prop->value);
+ }
+}
+
static gint search_msgs (Folder *folder,
FolderItem *container,
MsgNumberList **msgs,
clist* uidlist = NULL;
gboolean server_filtering_useless = FALSE;
IMAPSession *session;
+ gchar *charset_to_use = NULL;
if (on_server == NULL || !*on_server) {
return folder_item_search_msgs_local(folder, container, msgs, on_server,
IMAPSearchKey* matcherPart = NULL;
MatcherProp* prop = (MatcherProp*) cur->data;
gboolean is_all;
+ MatcherProp *imap_prop = imap_matcher_prop_set_charset(IMAP_FOLDER(folder), prop, &charset_to_use);
+
+ if (imap_prop == NULL) {
+ /* Couldn't convert matcherprop to IMAP - probably not ascii
+ * and server doesn't support the charsets we do. */
+ return -1;
+ }
+
+ matcherPart = search_make_key(imap_prop, &is_all);
- matcherPart = search_make_key(prop, &is_all);
+ matcherprop_free(imap_prop);
if (on_server) {
*on_server &= matcherPart != NULL && prop->matchtype == MATCHTYPE_MATCHCASE;
*msgs = g_slist_prepend(*msgs, GUINT_TO_POINTER(((MsgInfo*) cur->data)->msgnum));
count++;
}
+ procmsg_msg_list_free(list);
+
*msgs = g_slist_reverse(*msgs);
+
return count;
}
if (progress_cb)
progress_cb(progress_data, TRUE, 0, 0, container->total_msgs);
- result = imap_threaded_search(folder, IMAP_SEARCH_TYPE_KEYED, key, NULL, &uidlist);
+ result = imap_threaded_search(folder, IMAP_SEARCH_TYPE_KEYED, key, charset_to_use, NULL, &uidlist);
if (progress_cb)
progress_cb(progress_data, TRUE, container->total_msgs, 0, container->total_msgs);
gint result = 0;
*msgs = imap_uid_list_from_lep(uidlist, &result);
+
mailimap_search_result_free(uidlist);
+ if (charset_to_use != NULL)
+ g_free(charset_to_use);
+
return result;
+ } else if (charset_to_use != NULL) {
+ /* If search failed and was on an 8-bit string, try the next
+ * available charset to search if there still are some.
+ */
+ g_free(charset_to_use);
+
+ imap_change_search_charset(IMAP_FOLDER(folder));
+ if (IMAP_FOLDER(folder)->search_charset_supported)
+ return search_msgs(folder, container, msgs, on_server, predicate,
+ progress_cb, progress_data);
+ else
+ return -1;
} else {
return -1;
}
tags = carray_get(env_list, i+1);
msginfo = imap_envelope_from_lep(info, item);
if (msginfo == NULL) {
- slist_free_strings(tags);
- g_slist_free(tags);
+ slist_free_strings_full(tags);
continue;
}
g_slist_free(msginfo->tags);
}
if (msginfo->tags)
msginfo->tags = g_slist_reverse(msginfo->tags);
- slist_free_strings(tags);
- g_slist_free(tags);
+ slist_free_strings_full(tags);
msginfo->folder = item;
if (!newlist)
llast = newlist = g_slist_append(newlist, msginfo);
main_window_reflect_tags_changes(mainwindow_get_mainwindow());
}
- for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
- struct mailimap_set * imapset;
-
- imapset = cur->data;
- mailimap_set_free(imapset);
- }
+ imap_lep_set_free(seq_list);
session_set_access_time(SESSION(session));
stuff->done = TRUE;
static void imap_free_capabilities(IMAPSession *session)
{
- slist_free_strings(session->capability);
- g_slist_free(session->capability);
+ slist_free_strings_full(session->capability);
session->capability = NULL;
}
return r;
}
- session->folder_content_changed = FALSE;
-
if ((exists && exists != session->exists)
|| (recent && recent != session->recent)
|| (expunge && expunge != session->expunge)
if (folder->account && folder->account->low_bandwidth) {
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SIMPLE,
- NULL, NULL, &lep_uidlist);
+ NULL, NULL, NULL, &lep_uidlist);
}
if (r == MAILIMAP_NO_ERROR) {
lock_session(session); /* unlocked by get_list_of_uids */
if (FOLDER_ITEM(item)->path)
- statusbar_print_all(_("Scanning folder %s%c%s ..."),
+ statusbar_print_all(_("Scanning folder %s%c%s..."),
FOLDER_ITEM(item)->folder->name,
G_DIR_SEPARATOR,
FOLDER_ITEM(item)->path);
else
- statusbar_print_all(_("Scanning folder %s ..."),
+ statusbar_print_all(_("Scanning folder %s..."),
FOLDER_ITEM(item)->folder->name);
if (item->should_trash_cache) {
imapset = cur->data;
if (reverse_seen) {
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN, NULL,
- full_search ? NULL:imapset, &lep_uidlist);
+ NULL, full_search ? NULL:imapset, &lep_uidlist);
}
else {
r = imap_threaded_search(folder,
IMAP_SEARCH_TYPE_UNSEEN, NULL,
- full_search ? NULL:imapset, &lep_uidlist);
+ NULL, full_search ? NULL:imapset, &lep_uidlist);
}
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
}
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED, NULL,
- full_search ? NULL:imapset, &lep_uidlist);
+ NULL, full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
if (fitem->opened || fitem->processing_pending || fitem == folder->inbox) {
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED, NULL,
- full_search ? NULL:imapset, &lep_uidlist);
+ NULL, full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
if (flag_ok(IMAP_FOLDER_ITEM(fitem), IMAP_FLAG_FORWARDED)) {
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FORWARDED, NULL,
- full_search ? NULL:imapset, &lep_uidlist);
+ NULL, full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
if (flag_ok(IMAP_FOLDER_ITEM(fitem), IMAP_FLAG_SPAM)) {
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SPAM, NULL,
- full_search ? NULL:imapset, &lep_uidlist);
+ NULL, full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
}
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED, NULL,
- full_search ? NULL:imapset, &lep_uidlist);
+ NULL, full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
GINT_TO_POINTER(id));
g_free(real_tag);
}
- slist_free_strings(tags);
- g_slist_free(tags);
+ slist_free_strings_full(tags);
}
}
guint32 uid = 0;
goffset size = 0;
MsgFlags flags = {0, 0};
-
+
if (info->headers == NULL)
return NULL;
MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
}
flags.perm_flags = info->flags;
-
+
uid = info->uid;
size = (goffset) info->size;
msginfo = procheader_parse_str(info->headers, flags, FALSE, FALSE);
-
+
if (msginfo) {
msginfo->msgnum = uid;
msginfo->size = size;
if (account->protocol == A_IMAP4) {
RemoteFolder *folder = (RemoteFolder *)account->folder;
if (folder && folder->session) {
+ if (imap_is_busy(FOLDER(folder)))
+ imap_threaded_cancel(FOLDER(folder));
+
IMAPSession *session = (IMAPSession *)folder->session;
if (have_connectivity)
imap_threaded_disconnect(FOLDER(folder));
SESSION(session)->state = SESSION_DISCONNECTED;
SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
+ imap_safe_destroy(session);
folder->session = NULL;
}
}
projects / claws.git / blobdiff