/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* 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
#include <unistd.h>
#include <ctype.h>
#include <time.h>
-#if HAVE_LIBJCONV
-# include <jconv.h>
+#if HAVE_ICONV
+# include <iconv.h>
#endif
#include "intl.h"
#include "procmsg.h"
#include "procheader.h"
#include "folder.h"
-#include "statusbar.h"
#include "prefs_account.h"
#include "codeconv.h"
#include "utils.h"
#include "log.h"
#define IMAP4_PORT 143
-#if USE_SSL
+#if USE_OPENSSL
#define IMAPS_PORT 993
#endif
FolderItem item;
guint lastuid;
+ guint uid_next;
GSList *uid_list;
};
FolderItem *item);
static GSList *imap_parse_list (Folder *folder,
IMAPSession *session,
- const gchar *real_path);
+ const gchar *real_path,
+ gchar *separator);
static void imap_create_missing_folders (Folder *folder);
static FolderItem *imap_create_special_folder
FolderItem *dest,
MsgInfo *msginfo,
gboolean remove_source);
+#if 0
static gint imap_do_copy_msgs_with_dest (Folder *folder,
FolderItem *dest,
GSList *msglist,
gboolean remove_source);
+#endif
static GSList *imap_get_uncached_messages (IMAPSession *session,
FolderItem *item,
guint32 first_uid,
guint32 last_uid);
-static GSList *imap_delete_cached_messages (GSList *mlist,
- FolderItem *item,
- guint32 first_uid,
- guint32 last_uid);
static void imap_delete_all_cached_messages (FolderItem *item);
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open (const gchar *server,
gushort port,
SSLType ssl_type);
gushort port);
#endif
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open_tunnel(const gchar *server,
const gchar *tunnelcmd,
SSLType ssl_type);
const gchar *tunnelcmd);
#endif
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type);
#else
static SockInfo *imap_init_sock(SockInfo *sock);
gint *recent,
gint *unseen,
guint32 *uid_validity);
-static gint imap_get_uid (IMAPSession *session,
- gint msgnum,
- guint32 *uid);
static gint imap_status (IMAPSession *session,
IMAPFolder *folder,
const gchar *path,
static void imap_parse_namespace (IMAPSession *session,
IMAPFolder *folder);
+static void imap_get_namespace_by_list (IMAPSession *session,
+ IMAPFolder *folder);
static IMAPNameSpace *imap_find_namespace (IMAPFolder *folder,
const gchar *path);
static gchar imap_get_path_separator (IMAPFolder *folder,
static MsgInfo *imap_parse_envelope (SockInfo *sock,
FolderItem *item,
GString *line_str);
-static gint imap_greeting (SockInfo *sock,
- gboolean *is_preauth);
+static gint imap_greeting (SockInfo *sock,
+ gboolean *is_preauth);
+static void imap_get_capability (Session *session);
+static gboolean imap_has_capability (IMAPSession *session,
+ const gchar *cap);
/* low-level IMAP4rev1 commands */
static gint imap_cmd_login (SockInfo *sock,
static gint imap_cmd_fetch (SockInfo *sock,
guint32 uid,
const gchar *filename);
-static gint imap_cmd_append (SockInfo *sock,
+static gint imap_cmd_append (IMAPSession *session,
const gchar *destfolder,
- const gchar *file);
-static gint imap_cmd_copy (SockInfo *sock,
- guint32 uid,
- const gchar *destfolder);
+ const gchar *file,
+ gint32 *newuid);
+static gint imap_cmd_copy (IMAPSession *session,
+ gint32 msgnum,
+ const gchar *destfolder,
+ gint32 *new_uid);
static gint imap_cmd_store (SockInfo *sock,
guint32 first_uid,
guint32 last_uid,
static void imap_cmd_gen_send (SockInfo *sock,
const gchar *format, ...);
static gint imap_cmd_gen_recv (SockInfo *sock,
- gchar *buf,
- gint size);
+ gchar **buf);
/* misc utility functions */
static gchar *strchr_cpy (const gchar *src,
gchar *dest,
gint len);
static gchar *search_array_contain_str (GPtrArray *array,
- gchar *str);
+ const gchar *str);
static gchar *search_array_str (GPtrArray *array,
- gchar *str);
-static gchar *search_array_starts (GPtrArray *array,
- const gchar *str);
+ const gchar *str);
static void imap_path_separator_subst (gchar *str,
gchar separator);
gint imap_get_num_list (Folder *folder,
FolderItem *item,
GSList **list);
+GSList *imap_get_msginfos (Folder *folder,
+ FolderItem *item,
+ GSList *msgnum_list);
MsgInfo *imap_get_msginfo (Folder *folder,
FolderItem *item,
gint num);
gboolean imap_check_msgnum_validity (Folder *folder,
FolderItem *item);
+void imap_change_flags (Folder *folder,
+ FolderItem *item,
+ MsgInfo *msginfo,
+ MsgPermFlags newflags);
+
+FolderClass imap_class =
+{
+ F_IMAP,
+ "imap",
+ "IMAP4",
+
+ /* Folder functions */
+ imap_folder_new,
+ imap_folder_destroy,
+ imap_scan_tree,
+ imap_create_tree,
+
+ /* FolderItem functions */
+ imap_folder_item_new,
+ imap_folder_item_destroy,
+ imap_create_folder,
+ imap_rename_folder,
+ imap_remove_folder,
+ imap_get_num_list,
+ NULL,
+ NULL,
+ NULL,
+ imap_check_msgnum_validity,
+
+ /* Message functions */
+ imap_get_msginfo,
+ imap_get_msginfos,
+ imap_fetch_msg,
+ imap_add_msg,
+ imap_move_msg,
+ NULL,
+ imap_copy_msg,
+ NULL,
+ imap_remove_msg,
+ imap_remove_msgs,
+ imap_remove_all_msg,
+ imap_is_msg_changed,
+ imap_change_flags,
+};
+
+FolderClass *imap_get_class()
+{
+ return &imap_class;
+}
Folder *imap_folder_new(const gchar *name, const gchar *path)
{
Folder *folder;
folder = (Folder *)g_new0(IMAPFolder, 1);
+ folder->class = &imap_class;
imap_folder_init(folder, name, path);
return folder;
static void imap_folder_init(Folder *folder, const gchar *name,
const gchar *path)
{
- folder->type = F_IMAP;
-
folder_remote_folder_init((Folder *)folder, name, path);
-
-/*
- folder->get_msg_list = imap_get_msg_list;
-*/
- folder->item_new = imap_folder_item_new;
- folder->item_destroy = imap_folder_item_destroy;
- folder->fetch_msg = imap_fetch_msg;
- folder->add_msg = imap_add_msg;
- folder->move_msg = imap_move_msg;
- folder->move_msgs_with_dest = imap_move_msgs_with_dest;
- folder->copy_msg = imap_copy_msg;
- folder->copy_msgs_with_dest = imap_copy_msgs_with_dest;
- folder->remove_msg = imap_remove_msg;
- folder->remove_msgs = imap_remove_msgs;
- folder->remove_all_msg = imap_remove_all_msg;
- folder->is_msg_changed = imap_is_msg_changed;
-/*
- folder->scan = imap_scan_folder;
-*/
- folder->scan_tree = imap_scan_tree;
- folder->create_tree = imap_create_tree;
- folder->create_folder = imap_create_folder;
- folder->rename_folder = imap_rename_folder;
- folder->remove_folder = imap_remove_folder;
- folder->destroy = imap_folder_destroy;
- folder->check_msgnum_validity = imap_check_msgnum_validity;
-
- folder->get_num_list = imap_get_num_list;
- folder->get_msginfo = imap_get_msginfo;
}
static FolderItem *imap_folder_item_new(Folder *folder)
item = g_new0(IMAPFolderItem, 1);
item->lastuid = 0;
+ item->uid_next = 0;
item->uid_list = NULL;
return (FolderItem *)item;
IMAPFolderItem *item = (IMAPFolderItem *)node->data;
item->lastuid = 0;
+ item->uid_next = 0;
g_slist_free(item->uid_list);
item->uid_list = NULL;
static IMAPSession *imap_session_get(Folder *folder)
{
RemoteFolder *rfolder = REMOTE_FOLDER(folder);
+ Session *session = NULL;
gushort port;
g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(folder->type == F_IMAP, NULL);
+ g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
-#if USE_SSL
+#if USE_OPENSSL
port = folder->account->set_imapport ? folder->account->imapport
: folder->account->ssl_imap == SSL_TUNNEL
? IMAPS_PORT : IMAP4_PORT;
: IMAP4_PORT;
#endif
- if (!rfolder->session) {
- rfolder->session =
- imap_session_new(folder->account);
- if (rfolder->session) {
- imap_parse_namespace(IMAP_SESSION(rfolder->session),
- IMAP_FOLDER(folder));
- rfolder->session->last_access_time = time(NULL);
- imap_reset_uid_lists(folder);
- }
- statusbar_pop_all();
- return IMAP_SESSION(rfolder->session);
+ /* Make sure we have a session */
+ if (rfolder->session != NULL) {
+ session = rfolder->session;
+ } else {
+ imap_reset_uid_lists(folder);
+ session = imap_session_new(folder->account);
}
+ if(session == NULL)
+ return NULL;
+
+ /* Get CAPABILITY */
+ imap_get_capability(session);
+
+ /* Make sure session is authenticated */
+ if (!IMAP_SESSION(session)->authenticated)
+ imap_session_authenticate(IMAP_SESSION(session), folder->account);
+ if (!IMAP_SESSION(session)->authenticated) {
+ session_destroy(session);
+ rfolder->session = NULL;
+ return NULL;
+ }
+
+ /* Make sure we have parsed the IMAP namespace */
+ imap_parse_namespace(IMAP_SESSION(session),
+ IMAP_FOLDER(folder));
/* I think the point of this code is to avoid sending a
* keepalive if we've used the session recently and therefore
* A better solution than sending a NOOP every time would be
* for every command to be prepared to retry until it is
* successfully sent. -- mbp */
- if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
- rfolder->session->last_access_time = time(NULL);
- statusbar_pop_all();
- return IMAP_SESSION(rfolder->session);
- }
-
- if (imap_cmd_noop(rfolder->session->sock) != IMAP_SUCCESS) {
- log_warning(_("IMAP4 connection to %s:%d has been"
- " disconnected. Reconnecting...\n"),
- folder->account->recv_server, port);
- session_destroy(rfolder->session);
- rfolder->session =
- imap_session_new(folder->account);
- if (rfolder->session) {
- imap_parse_namespace(IMAP_SESSION(rfolder->session),
- IMAP_FOLDER(folder));
- imap_reset_uid_lists(folder);
+ if (time(NULL) - session->last_access_time > SESSION_TIMEOUT) {
+ /* verify that the session is still alive */
+ if (imap_cmd_noop(session->sock) != IMAP_SUCCESS) {
+ /* Check if this is the first try to establish a
+ connection, if yes we don't try to reconnect */
+ if (rfolder->session == NULL) {
+ log_warning(_("Connecting %s:%d failed"),
+ folder->account->recv_server, port);
+ session_destroy(session);
+ session = NULL;
+ } else {
+ log_warning(_("IMAP4 connection to %s:%d has been"
+ " disconnected. Reconnecting...\n"),
+ folder->account->recv_server, port);
+ session_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
+ endless loop */
+ rfolder->session = NULL;
+ session = SESSION(imap_session_get(folder));
+ }
}
}
- if (rfolder->session)
- rfolder->session->last_access_time = time(NULL);
- statusbar_pop_all();
- return IMAP_SESSION(rfolder->session);
+ rfolder->session = session;
+ if (session) {
+ session->last_access_time = time(NULL);
+ }
+ return IMAP_SESSION(session);
}
Session *imap_session_new(const PrefsAccount *account)
IMAPSession *session;
SockInfo *imap_sock;
gushort port;
- gchar *pass;
gboolean is_preauth;
-#ifdef USE_SSL
+#ifdef USE_OPENSSL
/* FIXME: IMAP over SSL only... */
SSLType ssl_type;
port = account->set_imapport ? account->imapport
- : account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
- ssl_type = account->ssl_imap ? TRUE : FALSE;
+ : account->ssl_imap == SSL_TUNNEL ? IMAPS_PORT : IMAP4_PORT;
+ ssl_type = account->ssl_imap;
#else
port = account->set_imapport ? account->imapport
: IMAP4_PORT;
if (account->set_tunnelcmd) {
log_message(_("creating tunneled IMAP4 connection\n"));
-#if USE_SSL
+#if USE_OPENSSL
if ((imap_sock = imap_open_tunnel(account->recv_server,
account->tunnelcmd,
ssl_type)) == NULL)
log_message(_("creating IMAP4 connection to %s:%d ...\n"),
account->recv_server, port);
-#if USE_SSL
+#if USE_OPENSSL
if ((imap_sock = imap_open(account->recv_server, port,
ssl_type)) == NULL)
#else
}
/* Only need to log in if the connection was not PREAUTH */
- imap_greeting(imap_sock, &is_preauth);
+ if (imap_greeting(imap_sock, &is_preauth) != IMAP_SUCCESS) {
+ sock_close(imap_sock);
+ return NULL;
+ }
log_message("IMAP connection is %s-authenticated\n",
(is_preauth) ? "pre" : "un");
- if (!is_preauth) {
- g_return_val_if_fail(account->userid != NULL, NULL);
-
- pass = account->passwd;
- if (!pass) {
- gchar *tmp_pass;
- tmp_pass = input_dialog_query_password(account->recv_server, account->userid);
- if (!tmp_pass)
- return NULL;
- Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return NULL;});
- g_free(tmp_pass);
- }
-
- if (imap_cmd_login(imap_sock, account->userid, pass) != IMAP_SUCCESS) {
- imap_cmd_logout(imap_sock);
- sock_close(imap_sock);
- return NULL;
- }
- }
session = g_new(IMAPSession, 1);
-
SESSION(session)->type = SESSION_IMAP;
SESSION(session)->server = g_strdup(account->recv_server);
SESSION(session)->sock = imap_sock;
SESSION(session)->destroy = imap_session_destroy;
+ session->capability = NULL;
+
session->mbox = NULL;
+ session->authenticated = is_preauth;
session_list = g_list_append(session_list, session);
return SESSION(session);
}
+void imap_session_authenticate(IMAPSession *session, const PrefsAccount *account)
+{
+ gchar *pass;
+
+ g_return_if_fail(account->userid != NULL);
+
+ pass = account->passwd;
+ if (!pass) {
+ gchar *tmp_pass;
+ tmp_pass = input_dialog_query_password(account->recv_server, account->userid);
+ if (!tmp_pass)
+ return;
+ Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return;});
+ g_free(tmp_pass);
+ }
+
+ if (imap_cmd_login(SESSION(session)->sock, account->userid, pass) != IMAP_SUCCESS) {
+ imap_cmd_logout(SESSION(session)->sock);
+ return;
+ }
+
+ session->authenticated = TRUE;
+}
+
void imap_session_destroy(Session *session)
{
sock_close(session->sock);
g_free(IMAP_SESSION(session)->mbox);
+ g_strfreev(IMAP_SESSION(session)->capability);
+
session_list = g_list_remove(session_list, session);
}
}
}
-#define THROW goto catch
-
-GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
-{
- GSList *mlist = NULL;
- IMAPSession *session;
- gint ok, exists = 0, recent = 0, unseen = 0;
- guint32 uid_validity = 0;
- guint32 first_uid = 0, last_uid = 0, begin;
-
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(folder->type == F_IMAP, NULL);
- g_return_val_if_fail(folder->account != NULL, NULL);
-
- session = imap_session_get(folder);
-
- if (!session) {
- mlist = procmsg_read_cache(item, FALSE);
- item->last_num = procmsg_get_last_num_in_msg_list(mlist);
- procmsg_set_flags(mlist, item);
- statusbar_pop_all();
- return mlist;
- }
-
- ok = imap_select(session, IMAP_FOLDER(folder), item->path,
- &exists, &recent, &unseen, &uid_validity);
- if (ok != IMAP_SUCCESS) THROW;
- if (exists > 0) {
- ok = imap_get_uid(session, 1, &first_uid);
- if (ok != IMAP_SUCCESS) THROW;
- if (1 != exists) {
- ok = imap_get_uid(session, exists, &last_uid);
- if (ok != IMAP_SUCCESS) THROW;
- } else
- last_uid = first_uid;
- } else {
- imap_delete_all_cached_messages(item);
- statusbar_pop_all();
- return NULL;
- }
-
- if (use_cache) {
- guint32 cache_last;
-
- mlist = procmsg_read_cache(item, FALSE);
- procmsg_set_flags(mlist, item);
- cache_last = procmsg_get_last_num_in_msg_list(mlist);
-
- /* calculating the range of envelope to get */
- if (item->mtime != uid_validity) {
- /* mailbox is changed (get all) */
- begin = first_uid;
- } else if (last_uid < cache_last) {
- /* mailbox is changed (get all) */
- begin = first_uid;
- } else if (last_uid == cache_last) {
- /* mailbox unchanged (get none)*/
- begin = 0;
- } else {
- begin = cache_last + 1;
- }
-
- item->mtime = uid_validity;
-
- if (first_uid > 0 && last_uid > 0) {
- mlist = imap_delete_cached_messages(mlist, item,
- 0, first_uid - 1);
- mlist = imap_delete_cached_messages(mlist, item,
- last_uid + 1,
- UINT_MAX);
- }
- if (begin > 0)
- mlist = imap_delete_cached_messages(mlist, item,
- begin, UINT_MAX);
- } else {
- imap_delete_all_cached_messages(item);
- begin = first_uid;
- }
-
- if (begin > 0 && begin <= last_uid) {
- GSList *newlist;
- newlist = imap_get_uncached_messages(session, item,
- begin, last_uid);
- mlist = g_slist_concat(mlist, newlist);
- }
-
- item->last_num = last_uid;
-
-catch:
- statusbar_pop_all();
- return mlist;
-}
-
-#undef THROW
-
gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
{
gchar *path, *filename;
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't select mailbox %s\n"), item->path);
+ g_warning("can't select mailbox %s\n", item->path);
g_free(filename);
return NULL;
}
debug_print("getting message %d...\n", uid);
ok = imap_cmd_fetch(SESSION(session)->sock, (guint32)uid, filename);
- statusbar_pop_all();
-
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't fetch message %d\n"), uid);
+ g_warning("can't fetch message %d\n", uid);
g_free(filename);
return NULL;
}
{
gchar *destdir;
IMAPSession *session;
- gint messages, recent, unseen;
- guint32 uid_next, uid_validity;
- gint ok;
+ gint ok, newuid;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
session = imap_session_get(folder);
if (!session) return -1;
- ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
- &messages, &recent, &uid_next, &uid_validity, &unseen);
- statusbar_pop_all();
- if (ok != IMAP_SUCCESS) {
- g_warning(_("can't append message %s\n"), file);
- return -1;
- }
-
destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
- ok = imap_cmd_append(SESSION(session)->sock, destdir, file);
+ ok = imap_cmd_append(session, destdir, file, &newuid);
g_free(destdir);
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't append message %s\n"), file);
+ g_warning("can't append message %s\n", file);
return -1;
}
FILE_OP_ERROR(file, "unlink");
}
- return uid_next;
+ return newuid;
}
static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
{
gchar *destdir;
IMAPSession *session;
- gint messages, recent, unseen;
- guint32 uid_next, uid_validity;
+ IMAPFlags iflags = 0;
+ guint32 newuid = 0;
gint ok;
g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(folder->type == F_IMAP, -1);
+ g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msginfo != NULL, -1);
if (!session) return -1;
if (msginfo->folder == dest) {
- g_warning(_("the src folder is identical to the dest.\n"));
- return -1;
- }
-
- ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
- &messages, &recent, &uid_next, &uid_validity, &unseen);
- statusbar_pop_all();
- if (ok != IMAP_SUCCESS) {
- g_warning(_("can't copy message\n"));
+ g_warning("the src folder is identical to the dest.\n");
return -1;
}
/* ensure source folder selected */
ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS)
return -1;
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, destdir);
- ok = imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum, destdir);
+ ok = imap_cmd_copy(session, msginfo->msgnum, destdir, &newuid);
if (ok == IMAP_SUCCESS && remove_source) {
imap_set_message_flags(session, msginfo->msgnum, msginfo->msgnum,
ok = imap_cmd_expunge(SESSION(session)->sock);
}
+ /* get the dest folder to set the flags */
+ if (newuid) {
+ ok = imap_select(session, IMAP_FOLDER(folder), dest->path,
+ NULL, NULL, NULL, NULL);
+ if (ok != IMAP_SUCCESS) /* the folder disappeared? */
+ return -1;
+
+ if (msginfo->flags.perm_flags & MSG_MARKED) iflags |= IMAP_FLAG_FLAGGED;
+ if (msginfo->flags.perm_flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
+ if (iflags)
+ if (imap_set_message_flags(session, newuid, newuid, iflags, TRUE)
+ != IMAP_SUCCESS)
+ newuid = 0;
+ }
+
g_free(destdir);
- statusbar_pop_all();
if (ok == IMAP_SUCCESS)
- return uid_next;
+ return newuid;
else
return -1;
}
+#if 0
static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
GSList *msglist,
gboolean remove_source)
msginfo = (MsgInfo *)cur->data;
if (msginfo->folder == dest) {
- g_warning(_("the src folder is identical to the dest.\n"));
+ g_warning("the src folder is identical to the dest.\n");
continue;
}
/* ensure source folder selected */
ok = imap_select(session, IMAP_FOLDER(folder),
msginfo->folder->path, NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (remove_source)
debug_print("Moving message %s%c%d to %s ...\n",
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, destdir);
- ok = imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum,
- destdir);
+ ok = imap_cmd_copy(session, msginfo, destdir);
if (ok == IMAP_SUCCESS && remove_source) {
imap_set_message_flags
ok = imap_cmd_expunge(SESSION(session)->sock);
g_free(destdir);
- statusbar_pop_all();
if (ok == IMAP_SUCCESS)
return 0;
else
return -1;
}
+#endif
gint imap_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
return ret;
}
+#if 0
gint imap_move_msgs_with_dest(Folder *folder, FolderItem *dest,
GSList *msglist)
{
return ret;
}
+#endif
gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
return ret;
}
+#if 0
gint imap_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
GSList *msglist)
{
return ret;
}
+#endif
gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
{
gchar *dir;
g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(folder->type == F_IMAP, -1);
+ g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
g_return_val_if_fail(item != NULL, -1);
session = imap_session_get(folder);
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS)
return ok;
ok = imap_set_message_flags
(IMAP_SESSION(REMOTE_FOLDER(folder)->session),
(guint32)uid, (guint32)uid, IMAP_FLAG_DELETED, TRUE);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: %d\n"), uid);
return ok;
}
ok = imap_cmd_expunge(SESSION(session)->sock);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't expunge\n"));
return ok;
guint32 uid;
g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(folder->type == F_IMAP, -1);
+ g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
g_return_val_if_fail(item != NULL, -1);
g_return_val_if_fail(msglist != NULL, -1);
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS)
return ok;
ok = imap_set_message_flags
(IMAP_SESSION(REMOTE_FOLDER(folder)->session),
uid, uid, IMAP_FLAG_DELETED, TRUE);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: %d\n"), uid);
return ok;
}
ok = imap_cmd_expunge(SESSION(session)->sock);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't expunge\n"));
return ok;
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
&exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS)
return ok;
if (exists == 0)
imap_cmd_gen_send(SESSION(session)->sock,
"STORE 1:%d +FLAGS (\\Deleted)", exists);
ok = imap_cmd_ok(SESSION(session)->sock, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: 1:%d\n"), exists);
return ok;
}
ok = imap_cmd_expunge(SESSION(session)->sock);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't expunge\n"));
return ok;
ok = imap_status(session, IMAP_FOLDER(folder), item->path,
&messages, &recent, &uid_next, &uid_validity, &unseen);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) return -1;
item->new = unseen > 0 ? recent : 0;
wildcard_path);
strtailchomp(real_path, separator);
- item_list = imap_parse_list(folder, session, real_path);
+ item_list = imap_parse_list(folder, session, real_path, NULL);
g_free(real_path);
for (cur = item_list; cur != NULL; cur = cur->next) {
return IMAP_SUCCESS;
}
-static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar *real_path)
+static GSList *imap_parse_list(Folder *folder, IMAPSession *session,
+ const gchar *real_path, gchar *separator)
{
gchar buf[IMAPBUFSIZE];
gchar flags[256];
- gchar separator[16];
+ gchar separator_str[16];
gchar *p;
gchar *name;
gchar *loc_name, *loc_path;
if (!p) continue;
while (*p == ' ') p++;
- p = strchr_cpy(p, ' ', separator, sizeof(separator));
+ p = strchr_cpy(p, ' ', separator_str, sizeof(separator_str));
if (!p) continue;
- extract_quote(separator, '"');
- if (!strcmp(separator, "NIL"))
- separator[0] = '\0';
+ extract_quote(separator_str, '"');
+ if (!strcmp(separator_str, "NIL"))
+ separator_str[0] = '\0';
+ if (separator)
+ *separator = separator_str[0];
buf[0] = '\0';
while (*p == ' ') p++;
buf, sizeof(buf), str);
else
strncpy2(buf, p, sizeof(buf));
- strtailchomp(buf, separator[0]);
+ strtailchomp(buf, separator_str[0]);
if (buf[0] == '\0') continue;
if (!strcmp(buf, real_path)) continue;
- if (separator[0] != '\0')
- subst_char(buf, separator[0], '/');
+ if (separator_str[0] != '\0')
+ subst_char(buf, separator_str[0], '/');
name = g_basename(buf);
if (name[0] == '.') continue;
}
g_string_free(str, TRUE);
- statusbar_pop_all();
return item_list;
}
new_item = imap_create_folder(folder, item, name);
if (!new_item) {
- g_warning(_("Can't create '%s'\n"), name);
+ g_warning("Can't create '%s'\n", name);
if (!folder->inbox) return NULL;
new_item = imap_create_folder(folder, folder->inbox, name);
if (!new_item)
- g_warning(_("Can't create '%s' under INBOX\n"), name);
+ g_warning("Can't create '%s' under INBOX\n", name);
else
new_item->stype = stype;
} else
argbuf = g_ptr_array_new();
ok = imap_cmd_list(SESSION(session)->sock, NULL, imap_path,
argbuf);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't create mailbox: LIST failed\n"));
g_free(imap_path);
g_free(dirpath);
+ ptr_array_free_strings(argbuf);
g_ptr_array_free(argbuf, TRUE);
return NULL;
}
break;
}
}
+ ptr_array_free_strings(argbuf);
g_ptr_array_free(argbuf, TRUE);
if (!exist) {
ok = imap_cmd_create(SESSION(session)->sock, imap_path);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't create mailbox\n"));
g_free(imap_path);
session->mbox = NULL;
ok = imap_cmd_examine(SESSION(session)->sock, "INBOX",
&exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
g_free(real_oldpath);
return -1;
imap_path_separator_subst(real_newpath, separator);
ok = imap_cmd_rename(SESSION(session)->sock, real_oldpath, real_newpath);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't rename mailbox: %s to %s\n"),
real_oldpath, real_newpath);
ok = imap_cmd_examine(SESSION(session)->sock, "INBOX",
&exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
g_free(path);
return -1;
}
ok = imap_cmd_delete(SESSION(session)->sock, path);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't delete mailbox\n"));
g_free(path);
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
g_return_val_if_fail(item->folder != NULL, NULL);
- g_return_val_if_fail(item->folder->type == F_IMAP, NULL);
+ g_return_val_if_fail(FOLDER_CLASS(item->folder) == &imap_class, NULL);
g_return_val_if_fail(first_uid <= last_uid, NULL);
if (imap_cmd_envelope(SESSION(session)->sock, first_uid, last_uid)
return newlist;
}
-static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
- guint32 first_uid, guint32 last_uid)
-{
- GSList *cur, *next;
- MsgInfo *msginfo;
- gchar *dir;
-
- g_return_val_if_fail(item != NULL, mlist);
- g_return_val_if_fail(item->folder != NULL, mlist);
- g_return_val_if_fail(item->folder->type == F_IMAP, mlist);
-
- debug_print("Deleting cached messages %u - %u ... ",
- first_uid, last_uid);
-
- dir = folder_item_get_path(item);
- if (is_dir_exist(dir))
- remove_numbered_files(dir, first_uid, last_uid);
- g_free(dir);
-
- for (cur = mlist; cur != NULL; ) {
- next = cur->next;
-
- msginfo = (MsgInfo *)cur->data;
- if (msginfo != NULL && first_uid <= msginfo->msgnum &&
- msginfo->msgnum <= last_uid) {
- procmsg_msginfo_free(msginfo);
- mlist = g_slist_remove(mlist, msginfo);
- }
-
- cur = next;
- }
-
- debug_print("done.\n");
-
- return mlist;
-}
-
static void imap_delete_all_cached_messages(FolderItem *item)
{
gchar *dir;
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->type == F_IMAP);
+ g_return_if_fail(FOLDER_CLASS(item->folder) == &imap_class);
debug_print("Deleting all cached messages...\n");
debug_print("done.\n");
}
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open_tunnel(const gchar *server,
const gchar *tunnelcmd,
SSLType ssl_type)
log_warning(_("Can't establish IMAP4 session with: %s\n"),
server);
return NULL;
-#if USE_SSL
+#if USE_OPENSSL
return imap_init_sock(sock, ssl_type);
#else
return imap_init_sock(sock);
}
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open(const gchar *server, gushort port,
SSLType ssl_type)
#else
return NULL;
}
-#if USE_SSL
+#if USE_OPENSSL
if (ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
log_warning(_("Can't establish IMAP4 session with: %s:%d\n"),
server, port);
#endif
}
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type)
#else
static SockInfo *imap_init_sock(SockInfo *sock)
#endif
{
imap_cmd_count = 0;
-#if USE_SSL
+#if USE_OPENSSL
if (ssl_type == SSL_STARTTLS) {
gint ok;
folder->ns_shared != NULL)
return;
+ if (!imap_has_capability(session, "NAMESPACE")) {
+ imap_get_namespace_by_list(session, folder);
+ return;
+ }
+
if (imap_cmd_namespace(SESSION(session)->sock, &ns_str)
!= IMAP_SUCCESS) {
log_warning(_("can't get namespace\n"));
}
str_array = strsplit_parenthesis(ns_str, '(', ')', 3);
+ if (str_array == NULL) {
+ g_free(ns_str);
+ imap_get_namespace_by_list(session, folder);
+ return;
+ }
if (str_array[0])
folder->ns_personal = imap_parse_namespace_str(str_array[0]);
if (str_array[0] && str_array[1])
g_free(ns_str);
}
+static void imap_get_namespace_by_list(IMAPSession *session, IMAPFolder *folder)
+{
+ GSList *item_list, *cur;
+ gchar separator = '\0';
+ IMAPNameSpace *namespace;
+
+ g_return_if_fail(session != NULL);
+ g_return_if_fail(folder != NULL);
+
+ if (folder->ns_personal != NULL ||
+ folder->ns_others != NULL ||
+ folder->ns_shared != NULL)
+ return;
+
+ imap_cmd_gen_send(SESSION(session)->sock, "LIST \"\" \"\"");
+ item_list = imap_parse_list(NULL, session, "", &separator);
+ for (cur = item_list; cur != NULL; cur = cur->next)
+ folder_item_destroy(FOLDER_ITEM(cur->data));
+ g_slist_free(item_list);
+
+ namespace = g_new(IMAPNameSpace, 1);
+ namespace->name = g_strdup("");
+ namespace->separator = separator;
+ folder->ns_personal = g_list_append(NULL, namespace);
+}
+
static IMAPNameSpace *imap_find_namespace_from_list(GList *ns_list,
const gchar *path)
{
g_free(nextline);
} while (block_len < len);
- debug_print("IMAP4< [contents of RFC822.HEADER]\n");
+ debug_print("IMAP4< [contents of BODY.PEEK[HEADER.FIELDS (...)]]\n");
*headers = g_strndup(cur_pos, len);
cur_pos += len;
} else if (!strncmp(cur_pos, "RFC822.SIZE ", 12)) {
cur_pos += 12;
size = strtol(cur_pos, &cur_pos, 10);
- } else if (!strncmp(cur_pos, "RFC822.HEADER ", 14)) {
+ } else if (!strncmp(cur_pos, "BODY[HEADER.FIELDS ", 19)) {
gchar *headers;
- cur_pos += 14;
+ cur_pos += 19;
+ if (*cur_pos != '(') {
+ g_warning("*cur_pos != '('\n");
+ procmsg_msginfo_free(msginfo);
+ return NULL;
+ }
+ cur_pos++;
+ PARSE_ONE_ELEMENT(')');
+ if (*cur_pos != ']') {
+ g_warning("*cur_pos != ']'\n");
+ procmsg_msginfo_free(msginfo);
+ return NULL;
+ }
+ cur_pos++;
+
cur_pos = imap_get_header(sock, cur_pos, &headers,
line_str);
msginfo = procheader_parse_str(headers, flags, FALSE, FALSE);
gint ok = IMAP_SUCCESS;
g_return_val_if_fail(msginfo != NULL, -1);
- g_return_val_if_fail(MSG_IS_IMAP(msginfo->flags), -1);
g_return_val_if_fail(msginfo->folder != NULL, -1);
g_return_val_if_fail(msginfo->folder->folder != NULL, -1);
folder = msginfo->folder->folder;
- g_return_val_if_fail(folder->type == F_IMAP, -1);
+ g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
session = imap_session_get(folder);
if (!session) return -1;
+ if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
+ NULL, NULL, NULL, NULL)) != IMAP_SUCCESS)
+ return ok;
+
if (flags & MSG_MARKED) iflags |= IMAP_FLAG_FLAGGED;
if (flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
if (iflags) {
gint ok = IMAP_SUCCESS;
g_return_val_if_fail(msginfo != NULL, -1);
- g_return_val_if_fail(MSG_IS_IMAP(msginfo->flags), -1);
g_return_val_if_fail(msginfo->folder != NULL, -1);
g_return_val_if_fail(msginfo->folder->folder != NULL, -1);
folder = msginfo->folder->folder;
- g_return_val_if_fail(folder->type == F_IMAP, -1);
+ g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
session = imap_session_get(folder);
if (!session) return -1;
#define THROW(err) { ok = err; goto catch; }
-static gint imap_get_uid(IMAPSession *session, gint msgnum, guint32 *uid)
-{
- gint ok;
- GPtrArray *argbuf;
- gchar *str;
- gint num;
-
- *uid = 0;
- argbuf = g_ptr_array_new();
-
- imap_cmd_gen_send(SESSION(session)->sock, "FETCH %d (UID)", msgnum);
- if ((ok = imap_cmd_ok(SESSION(session)->sock, argbuf)) != IMAP_SUCCESS)
- THROW(ok);
-
- str = search_array_contain_str(argbuf, "FETCH");
- if (!str) THROW(IMAP_ERROR);
-
- if (sscanf(str, "%d FETCH (UID %d)", &num, uid) != 2 ||
- num != msgnum) {
- g_warning("imap_get_uid(): invalid FETCH line.\n");
- THROW(IMAP_ERROR);
- }
-
-catch:
- ptr_array_free_strings(argbuf);
- g_ptr_array_free(argbuf, TRUE);
-
- return ok;
-}
-
static gint imap_status(IMAPSession *session, IMAPFolder *folder,
const gchar *path,
gint *messages, gint *recent,
imap_cmd_gen_send(sock, "NOOP");
argbuf = g_ptr_array_new(); /* will hold messages sent back */
r = imap_cmd_ok(sock, argbuf);
- *is_preauth = search_array_starts(argbuf, "PREAUTH") != NULL;
+ *is_preauth = search_array_str(argbuf, "PREAUTH") != NULL;
+
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
return r;
}
+static void imap_get_capability(Session *session)
+{
+ gchar *capstr;
+ GPtrArray *argbuf;
+
+ if (IMAP_SESSION(session)->capability != NULL)
+ return;
+
+ imap_cmd_gen_send(session->sock, "CAPABILITY");
+
+ argbuf = g_ptr_array_new();
+
+ if (imap_cmd_ok(session->sock, argbuf) != IMAP_SUCCESS ||
+ ((capstr = search_array_str(argbuf, "CAPABILITY ")) == NULL)) {
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+ return;
+ }
+
+ capstr += strlen("CAPABILITY ");
+
+ IMAP_SESSION(session)->capability = g_strsplit(capstr, " ", 0);
+
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+}
+
+static gboolean imap_has_capability(IMAPSession *session, const gchar *cap)
+{
+ gchar **p;
+
+ for (p = session->capability; *p != NULL; ++p)
+ if (g_strcasecmp(*p, cap) == 0)
+ return TRUE;
+
+ return FALSE;
+}
+
static gint imap_cmd_noop(SockInfo *sock)
{
imap_cmd_gen_send(sock, "NOOP");
return imap_cmd_ok(sock, NULL);
}
+static gint imap_cmd_search(SockInfo *sock, const gchar *criteria, GSList **list)
+{
+ gint ok;
+ gchar *uidlist;
+ GPtrArray *argbuf;
+
+ g_return_val_if_fail(criteria != NULL, IMAP_ERROR);
+ g_return_val_if_fail(list != NULL, IMAP_ERROR);
+
+ *list = NULL;
+
+ argbuf = g_ptr_array_new();
+ imap_cmd_gen_send(sock, "UID SEARCH %s", criteria);
+
+ ok = imap_cmd_ok(sock, argbuf);
+ if (ok != IMAP_SUCCESS) {
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+ return ok;
+ }
+
+ if ((uidlist = search_array_str(argbuf, "SEARCH ")) != NULL) {
+ gchar **strlist, **p;
+
+ strlist = g_strsplit(uidlist + 7, " ", 0);
+ for (p = strlist; *p != NULL; ++p) {
+ guint msgnum;
+
+ if (sscanf(*p, "%d", &msgnum) == 1)
+ *list = g_slist_append(*list, GINT_TO_POINTER(msgnum));
+ }
+ g_strfreev(strlist);
+ }
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+
+ return IMAP_SUCCESS;
+}
+
static gint imap_cmd_fetch(SockInfo *sock, guint32 uid, const gchar *filename)
{
gint ok;
- gchar buf[IMAPBUFSIZE];
+ gchar *buf;
gchar *cur_pos;
gchar size_str[32];
glong size_num;
imap_cmd_gen_send(sock, "UID FETCH %d BODY[]", uid);
- while ((ok = imap_cmd_gen_recv(sock, buf, sizeof(buf)))
+ while ((ok = imap_cmd_gen_recv(sock, &buf))
== IMAP_SUCCESS) {
- if (buf[0] != '*' || buf[1] != ' ')
+ if (buf[0] != '*' || buf[1] != ' ') {
+ g_free(buf);
return IMAP_ERROR;
+ }
if (strstr(buf, "FETCH") != NULL)
break;
}
return ok;
cur_pos = strchr(buf, '{');
- g_return_val_if_fail(cur_pos != NULL, IMAP_ERROR);
+ if (cur_pos == NULL) {
+ g_free(buf);
+ return IMAP_ERROR;
+ }
cur_pos = strchr_cpy(cur_pos + 1, '}', size_str, sizeof(size_str));
- g_return_val_if_fail(cur_pos != NULL, IMAP_ERROR);
+ if (cur_pos == NULL) {
+ g_free(buf);
+ return IMAP_ERROR;
+ }
size_num = atol(size_str);
- if (*cur_pos != '\0') return IMAP_ERROR;
+ if (*cur_pos != '\0') {
+ g_free(buf);
+ return IMAP_ERROR;
+ }
- if (recv_bytes_write_to_file(sock, size_num, filename) != 0)
+ if (recv_bytes_write_to_file(sock, size_num, filename) != 0) {
+ g_free(buf);
return IMAP_ERROR;
+ }
- if (imap_cmd_gen_recv(sock, buf, sizeof(buf)) != IMAP_SUCCESS)
+ if (imap_cmd_gen_recv(sock, &buf) != IMAP_SUCCESS) {
+ g_free(buf);
return IMAP_ERROR;
+ }
- if (buf[0] == '\0' || buf[strlen(buf) - 1] != ')')
+ if (buf[0] == '\0' || buf[strlen(buf) - 1] != ')') {
+ g_free(buf);
return IMAP_ERROR;
+ }
+ g_free(buf);
ok = imap_cmd_ok(sock, NULL);
return ok;
}
-static gint imap_cmd_append(SockInfo *sock, const gchar *destfolder,
- const gchar *file)
+static gint imap_cmd_append(IMAPSession *session, const gchar *destfolder,
+ const gchar *file, gint32 *new_uid)
{
gint ok;
- gint size;
+ gint size, newuid;
gchar *destfolder_;
- gchar buf[BUFFSIZE];
+ gchar buf[BUFFSIZE], *imapbuf;
FILE *fp;
+ GPtrArray *reply;
+ gchar *okmsginfo;
g_return_val_if_fail(file != NULL, IMAP_ERROR);
return -1;
}
QUOTE_IF_REQUIRED(destfolder_, destfolder);
- imap_cmd_gen_send(sock, "APPEND %s (\\Seen) {%d}", destfolder_, size);
+ imap_cmd_gen_send(SESSION(session)->sock, "APPEND %s (\\Seen) {%d}", destfolder_, size);
- ok = imap_cmd_gen_recv(sock, buf, sizeof(buf));
- if (ok != IMAP_SUCCESS || buf[0] != '+' || buf[1] != ' ') {
+ ok = imap_cmd_gen_recv(SESSION(session)->sock, &imapbuf);
+ if (ok != IMAP_SUCCESS || imapbuf[0] != '+' || imapbuf[1] != ' ') {
log_warning(_("can't append %s to %s\n"), file, destfolder_);
+ g_free(imapbuf);
fclose(fp);
return IMAP_ERROR;
}
+ g_free(imapbuf);
log_print("IMAP4> %s\n", _("(sending file...)"));
while (fgets(buf, sizeof(buf), fp) != NULL) {
strretchomp(buf);
- if (sock_puts(sock, buf) < 0) {
+ if (sock_puts(SESSION(session)->sock, buf) < 0) {
fclose(fp);
- sock_close(sock);
+ sock_close(SESSION(session)->sock);
return -1;
}
}
if (ferror(fp)) {
FILE_OP_ERROR(file, "fgets");
fclose(fp);
- sock_close(sock);
+ sock_close(SESSION(session)->sock);
return -1;
}
- sock_puts(sock, "");
+ sock_puts(SESSION(session)->sock, "");
fclose(fp);
- return imap_cmd_ok(sock, NULL);
+
+ reply = g_ptr_array_new();
+
+ *new_uid = 0;
+ ok = imap_cmd_ok(SESSION(session)->sock, reply);
+ if (ok != IMAP_SUCCESS)
+ log_warning(_("can't append message to %s\n"), destfolder_);
+ else if (
+ (new_uid != NULL) &&
+ (imap_has_capability(session, "UIDPLUS") && reply->len > 0) &&
+ ((okmsginfo = g_ptr_array_index(reply, reply->len - 1)) != NULL) &&
+ (sscanf(okmsginfo, "%*u OK [APPENDUID %*u %u]", &newuid) == 1)) {
+ *new_uid = newuid;
+ }
+
+ ptr_array_free_strings(reply);
+ g_ptr_array_free(reply, TRUE);
+ return ok;
}
-static gint imap_cmd_copy(SockInfo *sock, guint32 uid, const gchar *destfolder)
+
+static gint imap_cmd_copy(IMAPSession * session,
+ gint32 msgnum,
+ const gchar * destfolder, gint32 * new_uid)
{
gint ok;
+ gint32 olduid, newuid;
+ gchar *okmsginfo;
gchar *destfolder_;
+ GPtrArray *reply;
g_return_val_if_fail(destfolder != NULL, IMAP_ERROR);
+ g_return_val_if_fail(session != NULL, IMAP_ERROR);
+ g_return_val_if_fail(new_uid != NULL, IMAP_ERROR);
QUOTE_IF_REQUIRED(destfolder_, destfolder);
- imap_cmd_gen_send(sock, "UID COPY %d %s", uid, destfolder_);
+ imap_cmd_gen_send(SESSION(session)->sock, "UID COPY %d %s", msgnum, destfolder_);
- ok = imap_cmd_ok(sock, NULL);
- if (ok != IMAP_SUCCESS) {
- log_warning(_("can't copy %d to %s\n"), uid, destfolder_);
- return -1;
- }
+ reply = g_ptr_array_new();
+ *new_uid = 0;
+ ok = imap_cmd_ok(SESSION(session)->sock, reply);
+ if (ok != IMAP_SUCCESS)
+ log_warning(_("can't copy %d to %s\n"), msgnum, destfolder_);
+ else if (imap_has_capability(session, "UIDPLUS") && reply->len > 0)
+ if ((okmsginfo = g_ptr_array_index(reply, reply->len - 1)) != NULL &&
+ sscanf(okmsginfo, "%*u OK [COPYUID %*u %u %u]", &olduid, &newuid) == 2 &&
+ olduid == msgnum)
+ *new_uid = newuid;
+
+ ptr_array_free_strings(reply);
+ g_ptr_array_free(reply, TRUE);
return ok;
}
gint imap_cmd_envelope(SockInfo *sock, guint32 first_uid, guint32 last_uid)
{
+ static GString *header_fields = NULL;
+
+ if (header_fields == NULL) {
+ const HeaderEntry *headers, *elem;
+
+ headers = procheader_get_headernames(FALSE);
+ header_fields = g_string_new("");
+
+ for (elem = headers; elem->name != NULL; ++elem) {
+ gint namelen = strlen(elem->name);
+
+ /* Header fields ending with space are not rfc822 headers */
+ if (elem->name[namelen - 1] == ' ')
+ continue;
+
+ /* strip : at the of header field */
+ if(elem->name[namelen - 1] == ':')
+ namelen--;
+
+ if (namelen <= 0)
+ continue;
+
+ g_string_sprintfa(header_fields, "%s%.*s",
+ header_fields->str[0] != '\0' ? " " : "",
+ namelen, elem->name);
+ }
+ }
+
imap_cmd_gen_send
- (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE RFC822.HEADER)",
- first_uid, last_uid);
+ (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE BODY.PEEK[HEADER.FIELDS (%s)])",
+ first_uid, last_uid,
+ header_fields->str);
return IMAP_SUCCESS;
}
static gint imap_cmd_ok(SockInfo *sock, GPtrArray *argbuf)
{
gint ok;
- gchar buf[IMAPBUFSIZE];
+ gchar *buf;
gint cmd_num;
gchar cmd_status[IMAPBUFSIZE];
- while ((ok = imap_cmd_gen_recv(sock, buf, sizeof(buf)))
+ while ((ok = imap_cmd_gen_recv(sock, &buf))
== IMAP_SUCCESS) {
if (buf[0] == '*' && buf[1] == ' ') {
if (argbuf)
!strcmp(cmd_status, "OK")) {
if (argbuf)
g_ptr_array_add(argbuf, g_strdup(buf));
+ g_free(buf);
return IMAP_SUCCESS;
- } else
+ } else {
+ g_free(buf);
return IMAP_ERROR;
+ }
}
+ g_free(buf);
return ok;
}
sock_write(sock, buf, strlen(buf));
}
-static gint imap_cmd_gen_recv(SockInfo *sock, gchar *buf, gint size)
+static gint imap_cmd_gen_recv(SockInfo *sock, gchar **buf)
{
- if (sock_gets(sock, buf, size) == -1)
+ if ((*buf = sock_getline(sock)) == NULL)
return IMAP_SOCKET;
- strretchomp(buf);
+ strretchomp(*buf);
- log_print("IMAP4< %s\n", buf);
+ log_print("IMAP4< %s\n", *buf);
return IMAP_SUCCESS;
}
return (gchar *)(*p == ch ? p + 1 : p);
}
-static gchar *search_array_starts(GPtrArray *array, const gchar *str)
-{
- gint i;
- size_t len;
-
- g_return_val_if_fail(str != NULL, NULL);
- len = strlen(str);
- for (i = 0; i < array->len; i++) {
- gchar *tmp;
- tmp = g_ptr_array_index(array, i);
- if (strncmp(tmp, str, len) == 0)
- return tmp;
- }
- return NULL;
-}
-
-static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
+static gchar *search_array_contain_str(GPtrArray *array, const gchar *str)
{
gint i;
return NULL;
}
-static gchar *search_array_str(GPtrArray *array, gchar *str)
+static gchar *search_array_str(GPtrArray *array, const gchar *str)
{
gint i;
gint len;
static gchar *imap_modified_utf7_to_locale(const gchar *mutf7_str)
{
-#if !HAVE_LIBJCONV
+#if !HAVE_ICONV
return g_strdup(mutf7_str);
#else
static iconv_t cd = (iconv_t)-1;
if (cd == (iconv_t)-1) {
cd = iconv_open(conv_get_current_charset_str(), "UTF-7");
if (cd == (iconv_t)-1) {
- g_warning(_("iconv cannot convert UTF-7 to %s\n"),
+ g_warning("iconv cannot convert UTF-7 to %s\n",
conv_get_current_charset_str());
iconv_ok = FALSE;
return g_strdup(mutf7_str);
to_len = strlen(mutf7_str) * 5;
to_p = to_str = g_malloc(to_len + 1);
- if (iconv(cd, &norm_utf7_p, &norm_utf7_len, &to_p, &to_len) == -1) {
+ if (iconv(cd, (ICONV_CONST gchar **)&norm_utf7_p, &norm_utf7_len,
+ &to_p, &to_len) == -1) {
g_warning(_("iconv cannot convert UTF-7 to %s\n"),
conv_get_current_charset_str());
g_string_free(norm_utf7, TRUE);
*to_p = '\0';
return to_str;
-#endif /* !HAVE_LIBJCONV */
+#endif /* !HAVE_ICONV */
}
static gchar *imap_locale_to_modified_utf7(const gchar *from)
{
-#if !HAVE_LIBJCONV
+#if !HAVE_ICONV
return g_strdup(from);
#else
static iconv_t cd = (iconv_t)-1;
if (cd == (iconv_t)-1) {
cd = iconv_open("UTF-7", conv_get_current_charset_str());
if (cd == (iconv_t)-1) {
- g_warning(_("iconv cannot convert %s to UTF-7\n"),
+ g_warning("iconv cannot convert %s to UTF-7\n",
conv_get_current_charset_str());
iconv_ok = FALSE;
return g_strdup(from);
mblen++)
;
from_len -= mblen;
- if (iconv(cd, &from_tmp, &mblen,
+ if (iconv(cd, (ICONV_CONST gchar **)&from_tmp, &mblen,
&norm_utf7_p, &norm_utf7_len) == -1) {
- g_warning(_("iconv cannot convert %s to UTF-7\n"),
+ g_warning("iconv cannot convert %s to UTF-7\n",
conv_get_current_charset_str());
return g_strdup(from);
}
g_string_free(to_str, FALSE);
return to;
-#endif
+#endif /* !HAVE_ICONV */
}
static gboolean imap_rename_folder_func(GNode *node, gpointer data)
return FALSE;
}
-gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list)
+static gint get_list_of_uids(Folder *folder, IMAPFolderItem *item, GSList **msgnum_list)
{
- IMAPFolderItem *item = (IMAPFolderItem *)_item;
+ gint ok, nummsgs = 0, lastuid_old;
IMAPSession *session;
- gint ok, i, lastuid_old, nummsgs = 0;
- GPtrArray *argbuf;
- gchar *cmdbuf = NULL;
- gchar *dir;
-
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(item->item.path != NULL, -1);
- g_return_val_if_fail(folder->type == F_IMAP, -1);
- g_return_val_if_fail(folder->account != NULL, -1);
+ GSList *uidlist, *elem;
+ gchar *cmd_buf;
session = imap_session_get(folder);
g_return_val_if_fail(session != NULL, -1);
if (ok != IMAP_SUCCESS)
return -1;
- argbuf = g_ptr_array_new();
- if(item->lastuid) {
- cmdbuf = g_strdup_printf("UID FETCH %d:* (UID)", (item->lastuid + 1));
- } else {
- cmdbuf = g_strdup("FETCH 1:* (UID)");
+ cmd_buf = g_strdup_printf("UID %d:*", item->lastuid + 1);
+ ok = imap_cmd_search(SESSION(session)->sock, cmd_buf, &uidlist);
+ g_free(cmd_buf);
+
+ if (ok == IMAP_SOCKET) {
+ session_destroy((Session *)session);
+ ((RemoteFolder *)folder)->session = NULL;
+ return -1;
}
- imap_cmd_gen_send(SESSION(session)->sock, cmdbuf);
- g_free(cmdbuf);
- ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
+
if (ok != IMAP_SUCCESS) {
+ gint i;
+ GPtrArray *argbuf;
+
+ argbuf = g_ptr_array_new();
+
+ cmd_buf = g_strdup_printf("UID FETCH %d:* (UID)", item->lastuid + 1);
+ imap_cmd_gen_send(SESSION(session)->sock, cmd_buf);
+ g_free(cmd_buf);
+ ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
+ if (ok != IMAP_SUCCESS) {
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+ return -1;
+ }
+
+ for(i = 0; i < argbuf->len; i++) {
+ int ret, msgnum;
+
+ if((ret = sscanf(g_ptr_array_index(argbuf, i),
+ "%*d FETCH (UID %d)", &msgnum)) == 1)
+ uidlist = g_slist_prepend(uidlist, GINT_TO_POINTER(msgnum));
+ }
ptr_array_free_strings(argbuf);
g_ptr_array_free(argbuf, TRUE);
- return -1;
}
lastuid_old = item->lastuid;
*msgnum_list = g_slist_copy(item->uid_list);
+ nummsgs = g_slist_length(*msgnum_list);
debug_print("Got %d uids from cache\n", g_slist_length(item->uid_list));
- for(i = 0; i < argbuf->len; i++) {
- int ret, msgidx, msgnum;
-
- if((ret = sscanf(g_ptr_array_index(argbuf, i), "%d FETCH (UID %d)", &msgidx, &msgnum)) == 2) {
- if(msgnum > lastuid_old) {
- *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(msgnum));
- item->uid_list = g_slist_prepend(item->uid_list, GINT_TO_POINTER(msgnum));
- nummsgs++;
-
- if(msgnum > item->lastuid)
- item->lastuid = msgnum;
- }
+
+ for (elem = uidlist; elem != NULL; elem = g_slist_next(elem)) {
+ guint msgnum;
+
+ msgnum = GPOINTER_TO_INT(elem->data);
+ if (msgnum > lastuid_old) {
+ *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(msgnum));
+ item->uid_list = g_slist_prepend(item->uid_list, GINT_TO_POINTER(msgnum));
+ nummsgs++;
+
+ if(msgnum > item->lastuid)
+ item->lastuid = msgnum;
+ }
+ }
+ g_slist_free(uidlist);
+
+ return nummsgs;
+}
+
+gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list)
+{
+ IMAPFolderItem *item = (IMAPFolderItem *)_item;
+ IMAPSession *session;
+ gint ok, nummsgs = 0, exists, recent, unseen, uid_val, uid_next;
+ GSList *uidlist;
+ gchar *dir;
+
+ g_return_val_if_fail(folder != NULL, -1);
+ g_return_val_if_fail(item != NULL, -1);
+ g_return_val_if_fail(item->item.path != NULL, -1);
+ g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
+ g_return_val_if_fail(folder->account != NULL, -1);
+
+ session = imap_session_get(folder);
+ g_return_val_if_fail(session != NULL, -1);
+
+ ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
+ &exists, &recent, &uid_next, &uid_val, &unseen);
+ if (ok != IMAP_SUCCESS)
+ return -1;
+
+ /* If old uid_next matches new uid_next we can be sure no message
+ was added to the folder */
+ if (uid_next == item->uid_next) {
+ nummsgs = g_slist_length(item->uid_list);
+
+ /* If number of messages is still the same we
+ know our caches message numbers are still valid,
+ otherwise if the number of messages has decrease
+ we discard our cache to start a new scan to find
+ out which numbers have been removed */
+ if (exists == nummsgs) {
+ *msgnum_list = g_slist_copy(item->uid_list);
+ return nummsgs;
+ } else if (exists < nummsgs) {
+ debug_print("Freeing imap uid cache");
+ item->lastuid = 0;
+ g_slist_free(item->uid_list);
+ item->uid_list = NULL;
}
}
+ item->uid_next = uid_next;
+
+ if (exists == 0) {
+ *msgnum_list = NULL;
+ return 0;
+ }
+
+ nummsgs = get_list_of_uids(folder, item, &uidlist);
+
+ if (nummsgs != exists) {
+ /* Cache contains more messages then folder, we have cached
+ an old UID of a message that was removed and new messages
+ have been added too, otherwise the uid_next check would
+ not have failed */
+ debug_print("Freeing imap uid cache");
+ item->lastuid = 0;
+ g_slist_free(item->uid_list);
+ item->uid_list = NULL;
+
+ g_slist_free(*msgnum_list);
+
+ nummsgs = get_list_of_uids(folder, item, &uidlist);
+ }
+
+ *msgnum_list = uidlist;
dir = folder_item_get_path((FolderItem *)item);
debug_print("removing old messages from %s\n", dir);
return msginfo;
}
+static int compare_uint(gconstpointer a, gconstpointer b)
+{
+ return a-b;
+}
+
+GSList *imap_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
+{
+ IMAPSession *session;
+ GSList *sorted_list, *elem, *ret = NULL;
+ gint ok, startnum, lastnum;
+
+ g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(item != NULL, NULL);
+ g_return_val_if_fail(msgnum_list != NULL, NULL);
+
+ session = imap_session_get(folder);
+ g_return_val_if_fail(session != NULL, NULL);
+
+ ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+ NULL, NULL, NULL, NULL);
+ if (ok != IMAP_SUCCESS)
+ return NULL;
+
+ sorted_list = g_slist_sort(g_slist_copy(msgnum_list), compare_uint);
+
+ startnum = lastnum = GPOINTER_TO_INT(sorted_list->data);
+
+ for (elem = sorted_list;; elem = g_slist_next(elem)) {
+ guint num;
+
+ if (elem)
+ num = GPOINTER_TO_INT(elem->data);
+
+ if (num > lastnum + 1 || elem == NULL) {
+ if (!(item->stype == F_QUEUE || item->stype == F_DRAFT)) {
+ ret = g_slist_concat(ret,
+ imap_get_uncached_messages(
+ session, item, startnum, lastnum));
+ } else {
+ int i;
+ for (i = startnum; i <= lastnum; ++i) {
+ gchar *file;
+
+ file = imap_fetch_msg(folder, item, i);
+ if (file != NULL) {
+ MsgInfo *msginfo = imap_parse_msg(file, item);
+ if (msginfo != NULL) {
+ msginfo->msgnum = i;
+ ret = g_slist_append(ret, msginfo);
+ }
+ g_free(file);
+ }
+ }
+ }
+
+ if (elem == NULL)
+ break;
+
+ startnum = num;
+ }
+ lastnum = num;
+ }
+
+ g_slist_free(sorted_list);
+
+ return ret;
+}
MsgInfo *imap_get_msginfo(Folder *folder, FolderItem *item, gint uid)
{
IMAPSession *session;
MsgInfo *msginfo = NULL;
+ gint ok;
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
session = imap_session_get(folder);
g_return_val_if_fail(session != NULL, NULL);
+ ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+ NULL, NULL, NULL, NULL);
+ if (ok != IMAP_SUCCESS)
+ return NULL;
+
if (!(item->stype == F_QUEUE || item->stype == F_DRAFT)) {
GSList *list;
g_return_val_if_fail(folder != NULL, FALSE);
g_return_val_if_fail(item != NULL, FALSE);
g_return_val_if_fail(item->item.folder != NULL, FALSE);
- g_return_val_if_fail(item->item.folder->type == F_IMAP, FALSE);
+ g_return_val_if_fail(FOLDER_CLASS(item->item.folder) == &imap_class, FALSE);
session = imap_session_get(folder);
g_return_val_if_fail(session != NULL, FALSE);
return FALSE;
}
+
+void imap_change_flags(Folder *folder, FolderItem *item, MsgInfo *msginfo, MsgPermFlags newflags)
+{
+ IMAPSession *session;
+ IMAPFlags flags_set = 0, flags_unset = 0;
+ gint ok = IMAP_SUCCESS;
+
+ g_return_if_fail(folder != NULL);
+ g_return_if_fail(folder->class == &imap_class);
+ g_return_if_fail(item != NULL);
+ g_return_if_fail(item->folder == folder);
+ g_return_if_fail(msginfo != NULL);
+ g_return_if_fail(msginfo->folder == item);
+
+ session = imap_session_get(folder);
+ if (!session) return;
+
+ if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
+ NULL, NULL, NULL, NULL)) != IMAP_SUCCESS)
+ return;
+
+ if (!MSG_IS_MARKED(msginfo->flags) && (newflags & MSG_MARKED))
+ flags_set |= IMAP_FLAG_FLAGGED;
+ if ( MSG_IS_MARKED(msginfo->flags) && !(newflags & MSG_MARKED))
+ flags_unset |= IMAP_FLAG_FLAGGED;
+
+ if (!MSG_IS_UNREAD(msginfo->flags) && (newflags & MSG_UNREAD))
+ flags_unset |= IMAP_FLAG_SEEN;
+ if ( MSG_IS_UNREAD(msginfo->flags) && !(newflags & MSG_UNREAD))
+ flags_set |= IMAP_FLAG_SEEN;
+
+ if (!MSG_IS_REPLIED(msginfo->flags) && (newflags & MSG_REPLIED))
+ flags_set |= IMAP_FLAG_ANSWERED;
+ if ( MSG_IS_REPLIED(msginfo->flags) && !(newflags & MSG_REPLIED))
+ flags_set |= IMAP_FLAG_ANSWERED;
+
+ if (flags_set) {
+ ok = imap_set_message_flags(session, msginfo->msgnum,
+ msginfo->msgnum, flags_set, TRUE);
+ if (ok != IMAP_SUCCESS) return;
+ }
+
+ if (flags_unset) {
+ ok = imap_set_message_flags(session, msginfo->msgnum,
+ msginfo->msgnum, flags_unset, FALSE);
+ if (ok != IMAP_SUCCESS) return;
+ }
+
+ msginfo->flags.perm_flags = newflags;
+
+ return;
+}
projects / claws.git / blobdiff