#include "procheader.h"
#include "prefs_account.h"
#include "codeconv.h"
+#include "md5.h"
+#include "base64.h"
#include "utils.h"
#include "inputdialog.h"
#include "log.h"
#define IMAP_ERROR 7
#define IMAPBUFSIZE 8192
-#define IMAPCMDLIMIT 1000
typedef enum
{
#define IMAPS_PORT 993
#endif
+#define IMAP_CMD_LIMIT 1000
+
#define QUOTE_IF_REQUIRED(out, str) \
{ \
if (*str != '"' && strpbrk(str, " \t(){}%*") != NULL) { \
static gchar *imap_fetch_msg(Folder * folder, FolderItem * item, gint uid);
static gint imap_add_msg(Folder * folder,
FolderItem * dest,
- const gchar * file, gboolean remove_source);
+ const gchar * file, MsgFlags * flags);
+static gint imap_add_msgs(Folder * folder, FolderItem * dest,
+ GSList * file_list,
+ GRelation *relation);
static gint imap_copy_msg(Folder * folder,
FolderItem * dest, MsgInfo * msginfo);
+static gint imap_copy_msgs(Folder *folder, FolderItem *dest,
+ MsgInfoList *msglist, GRelation *relation);
static gint imap_remove_msg(Folder * folder, FolderItem * item, gint uid);
static gint imap_remove_all_msg(Folder * folder, FolderItem * item);
static gboolean imap_is_msg_changed(Folder * folder,
FolderItem * item, MsgInfo * msginfo);
+static gint imap_close(Folder * folder, FolderItem * item);
+
static void imap_scan_tree(Folder * folder);
static gint imap_create_tree(Folder * folder);
static IMAPSession *imap_session_get (Folder *folder);
+static gint imap_auth (IMAPSession *session,
+ const gchar *user,
+ const gchar *pass,
+ IMAPAuthType type);
+
static gint imap_scan_tree_recursive (IMAPSession *session,
FolderItem *item);
static GSList *imap_parse_list (IMAPFolder *folder,
SpecialFolderItemType stype,
const gchar *name);
-static gint imap_do_copy (Folder *folder,
+static gint imap_do_copy_msgs (Folder *folder,
FolderItem *dest,
- MsgInfo *msginfo,
- gboolean remove_source);
+ MsgInfoList *msglist,
+ GRelation *relation);
static void imap_delete_all_cached_messages (FolderItem *item);
static SockInfo *imap_init_sock(SockInfo *sock);
#endif
+static gchar *imap_get_flag_str (IMAPFlags flags);
static gint imap_set_message_flags (IMAPSession *session,
MsgNumberList *numlist,
- IMAPFlags flag,
+ IMAPFlags flags,
gboolean is_set);
static gint imap_select (IMAPSession *session,
IMAPFolder *folder,
static gboolean imap_has_capability (IMAPSession *session,
const gchar *cap);
void imap_free_capabilities (IMAPSession *session);
-static const IMAPSet numberlist_to_imapset
- (MsgNumberList *list);
/* low-level IMAP4rev1 commands */
+static gint imap_cmd_authenticate
+ (IMAPSession *session,
+ const gchar *user,
+ const gchar *pass,
+ IMAPAuthType type);
static gint imap_cmd_login (IMAPSession *sock,
const gchar *user,
const gchar *pass);
static gint imap_cmd_append (IMAPSession *session,
const gchar *destfolder,
const gchar *file,
+ IMAPFlags flags,
gint32 *newuid);
-static gint imap_cmd_copy (IMAPSession *session,
- gint32 msgnum,
- const gchar *destfolder,
- gint32 *new_uid);
+static gint imap_cmd_copy (IMAPSession *session,
+ const gchar *seq_set,
+ const gchar *destfolder,
+ GRelation *uid_mapping);
static gint imap_cmd_store (IMAPSession *sock,
IMAPSet set,
gchar *sub_cmd);
static gint imap_cmd_expunge (IMAPSession *sock);
+static gint imap_cmd_close (IMAPSession *session);
static gint imap_cmd_ok (IMAPSession *session,
GPtrArray *argbuf);
static void imap_gen_send (IMAPSession *sock,
const gchar *format, ...);
static gint imap_gen_recv (IMAPSession *sock,
- gchar **buf);
+ gchar **ret);
/* misc utility functions */
static gchar *strchr_cpy (const gchar *src,
static gchar *imap_modified_utf7_to_locale (const gchar *mutf7_str);
static gchar *imap_locale_to_modified_utf7 (const gchar *from);
+static GSList *imap_get_seq_set_from_numlist (MsgNumberList *msglist);
+static GSList *imap_get_seq_set_from_msglist (MsgInfoList *msglist);
+static void imap_seq_set_free (GSList *seq_list);
+
static gboolean imap_rename_folder_func (GNode *node,
gpointer data);
static gint imap_get_num_list (Folder *folder,
FolderItem *item,
MsgInfo *msginfo,
MsgPermFlags newflags);
+static gchar *imap_folder_get_path (Folder *folder);
+static gchar *imap_item_get_path (Folder *folder,
+ FolderItem *item);
FolderClass imap_class =
{
/* FolderItem functions */
imap_folder_item_new,
imap_folder_item_destroy,
+ imap_item_get_path,
imap_create_folder,
imap_rename_folder,
imap_remove_folder,
+ imap_close,
imap_get_num_list,
NULL,
NULL,
imap_get_msginfos,
imap_fetch_msg,
imap_add_msg,
+ imap_add_msgs,
imap_copy_msg,
+ imap_copy_msgs,
imap_remove_msg,
imap_remove_all_msg,
imap_is_msg_changed,
{
gchar *dir;
- dir = folder_get_path(folder);
+ dir = imap_folder_get_path(folder);
if (is_dir_exist(dir))
remove_dir_recursive(dir);
g_free(dir);
g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, imap_reset_uid_lists_func, NULL);
}
+static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass,
+ IMAPAuthType type)
+{
+ if (type == 0 || type == IMAP_AUTH_LOGIN)
+ return imap_cmd_login(session, user, pass);
+ else
+ return imap_cmd_authenticate(session, user, pass, type);
+}
+
static IMAPSession *imap_session_get(Folder *folder)
{
RemoteFolder *rfolder = REMOTE_FOLDER(folder);
IMAPSession *session = NULL;
- gushort port;
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
-#if USE_OPENSSL
- port = folder->account->set_imapport ? folder->account->imapport
- : folder->account->ssl_imap == SSL_TUNNEL
- ? IMAPS_PORT : IMAP4_PORT;
-#else
- port = folder->account->set_imapport ? folder->account->imapport
- : IMAP4_PORT;
-#endif
-
/* Make sure we have a session */
if (rfolder->session != NULL) {
session = IMAP_SESSION(rfolder->session);
/* 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);
+ log_warning(_("Connecting %s failed"),
+ folder->account->recv_server);
session_destroy(SESSION(session));
session = NULL;
} else {
- log_warning(_("IMAP4 connection to %s:%d has been"
+ log_warning(_("IMAP4 connection to %s has been"
" disconnected. Reconnecting...\n"),
- folder->account->recv_server, port);
+ folder->account->recv_server);
session_destroy(SESSION(session));
/* Clear folders session to make imap_session_get create
a new session, because of rfolder->session == NULL
g_free(tmp_pass);
}
- if (imap_cmd_login(session, account->userid, pass) != IMAP_SUCCESS) {
+ if (imap_auth(session, account->userid, pass, account->imap_auth_type) != IMAP_SUCCESS) {
imap_cmd_logout(session);
return;
}
return filename;
}
-gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
- gboolean remove_source)
+gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file, MsgFlags *flags)
+{
+ gint ret;
+ GSList file_list;
+ MsgFileInfo fileinfo;
+
+ g_return_val_if_fail(file != NULL, -1);
+
+ fileinfo.file = (gchar *)file;
+ fileinfo.flags = flags;
+ file_list.data = &fileinfo;
+ file_list.next = NULL;
+
+ ret = imap_add_msgs(folder, dest, &file_list, NULL);
+ return ret;
+}
+
+gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
+ GRelation *relation)
{
gchar *destdir;
IMAPSession *session;
- gint ok, newuid;
+ guint32 last_uid = 0;
+ GSList *cur;
+ MsgFileInfo *fileinfo;
+ gint ok, newnum;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(file != NULL, -1);
+ g_return_val_if_fail(file_list != NULL, -1);
session = imap_session_get(folder);
if (!session) return -1;
destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
- ok = imap_cmd_append(session, destdir, file, &newuid);
- g_free(destdir);
- if (ok != IMAP_SUCCESS) {
- g_warning("can't append message %s\n", file);
- return -1;
- }
+ for (cur = file_list; cur != NULL; cur = cur->next) {
+ IMAPFlags iflags = 0;
+
+ fileinfo = (MsgFileInfo *)cur->data;
- if (remove_source) {
- if (unlink(file) < 0)
- FILE_OP_ERROR(file, "unlink");
+ if (fileinfo->flags) {
+ if (MSG_IS_MARKED(*fileinfo->flags))
+ iflags |= IMAP_FLAG_FLAGGED;
+ if (MSG_IS_REPLIED(*fileinfo->flags))
+ iflags |= IMAP_FLAG_ANSWERED;
+ if (!MSG_IS_UNREAD(*fileinfo->flags))
+ iflags |= IMAP_FLAG_SEEN;
+ }
+
+ if (dest->stype == F_OUTBOX ||
+ dest->stype == F_QUEUE ||
+ dest->stype == F_DRAFT ||
+ dest->stype == F_TRASH)
+ iflags |= IMAP_FLAG_SEEN;
+
+ ok = imap_cmd_append(session, destdir, fileinfo->file, iflags, &newnum);
+
+ if (ok != IMAP_SUCCESS) {
+ g_warning("can't append message %s\n", fileinfo->file);
+ g_free(destdir);
+ return -1;
+ }
+
+ if (relation != NULL)
+ g_relation_insert(relation, fileinfo, GINT_TO_POINTER(newnum));
+ if (newnum > last_uid)
+ last_uid = newnum;
}
- return newuid;
+ g_free(destdir);
+
+ return last_uid;
}
-static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
- gboolean remove_source)
+static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest,
+ MsgInfoList *msglist, GRelation *relation)
{
gchar *destdir;
+ GSList *seq_list, *cur;
+ MsgInfo *msginfo;
IMAPSession *session;
- guint32 newuid = 0;
- gint ok;
+ gint ok = IMAP_SUCCESS;
+ GRelation *uid_mapping;
+ gint last_num = 0;
g_return_val_if_fail(folder != NULL, -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);
+ g_return_val_if_fail(msglist != NULL, -1);
session = imap_session_get(folder);
if (!session) return -1;
+ msginfo = (MsgInfo *)msglist->data;
if (msginfo->folder == dest) {
g_warning("the src folder is identical to the dest.\n");
return -1;
}
destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
+ seq_list = imap_get_seq_set_from_msglist(msglist);
+ uid_mapping = g_relation_new(2);
+ g_relation_index(uid_mapping, 0, g_direct_hash, g_direct_equal);
+
+ for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
+ gchar *seq_set = (gchar *)cur->data;
- /* ensure source folder selected */
- ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
- NULL, NULL, NULL, NULL);
- if (ok != IMAP_SUCCESS)
- return -1;
-
- if (remove_source)
- debug_print("Moving message %s%c%d to %s ...\n",
+ debug_print("Copying message %s%c[%s] to %s ...\n",
msginfo->folder->path, G_DIR_SEPARATOR,
- msginfo->msgnum, destdir);
- else
- debug_print("Copying message %s%c%d to %s ...\n",
- msginfo->folder->path, G_DIR_SEPARATOR,
- msginfo->msgnum, destdir);
-
- ok = imap_cmd_copy(session, msginfo->msgnum, destdir, &newuid);
+ seq_set, destdir);
- if (ok == IMAP_SUCCESS && remove_source) {
- MsgNumberList numlist;
+ ok = imap_cmd_copy(session, seq_set, destdir, uid_mapping);
+ if (ok != IMAP_SUCCESS) {
+ g_relation_destroy(uid_mapping);
+ imap_seq_set_free(seq_list);
+ return -1;
+ }
+ }
- numlist.next = NULL;
- numlist.data = GINT_TO_POINTER(msginfo->msgnum);
+ for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ GTuples *tuples;
- imap_set_message_flags(session, &numlist,
- IMAP_FLAG_DELETED, TRUE);
- ok = imap_cmd_expunge(session);
+ tuples = g_relation_select(uid_mapping,
+ GINT_TO_POINTER(msginfo->msgnum),
+ 0);
+ if (tuples->len > 0) {
+ gint num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+ g_relation_insert(relation, msginfo,
+ GPOINTER_TO_INT(num));
+ if (num > last_num)
+ last_num = num;
+ } else
+ g_relation_insert(relation, msginfo,
+ GPOINTER_TO_INT(0));
+ g_tuples_destroy(tuples);
}
+
+ imap_seq_set_free(seq_list);
g_free(destdir);
if (ok == IMAP_SUCCESS)
- return newuid;
+ return last_num;
else
return -1;
}
gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
- gchar *srcfile;
- gint ret = 0;
+ GSList msglist;
+
+ g_return_val_if_fail(msginfo != NULL, -1);
+
+ msglist.data = msginfo;
+ msglist.next = NULL;
+
+ return imap_copy_msgs(folder, dest, &msglist, NULL);
+}
+
+gint imap_copy_msgs(Folder *folder, FolderItem *dest,
+ MsgInfoList *msglist, GRelation *relation)
+{
+ MsgInfo *msginfo;
+ GSList *file_list;
+ gint ret;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msginfo != NULL, -1);
+ g_return_val_if_fail(msglist != NULL, -1);
+
+ msginfo = (MsgInfo *)msglist->data;
g_return_val_if_fail(msginfo->folder != NULL, -1);
if (folder == msginfo->folder->folder)
- return imap_do_copy(folder, dest, msginfo, FALSE);
+ return imap_do_copy_msgs(folder, dest, msglist, relation);
- srcfile = procmsg_get_message_file(msginfo);
- if (!srcfile) return -1;
+ file_list = procmsg_get_message_file_list(msglist);
+ g_return_val_if_fail(file_list != NULL, -1);
- ret = imap_add_msg(folder, dest, srcfile, FALSE);
+ ret = imap_add_msgs(folder, dest, file_list, relation);
- g_free(srcfile);
+ procmsg_message_file_list_free(file_list);
return ret;
}
return IMAP_SUCCESS;
imap_gen_send(session,
- "STORE 1:%d +FLAGS (\\Deleted)", exists);
+ "STORE 1:%d +FLAGS.SILENT (\\Deleted)", exists);
ok = imap_cmd_ok(session, NULL);
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: 1:%d\n"), exists);
return FALSE;
}
+gint imap_close(Folder *folder, FolderItem *item)
+{
+ gint ok;
+ IMAPSession *session;
+
+ g_return_val_if_fail(folder != NULL, -1);
+
+ session = imap_session_get(folder);
+ if (!session) return -1;
+
+ if (session->mbox) {
+ ok = imap_cmd_close(session);
+ if (ok != IMAP_SUCCESS)
+ log_warning(_("can't close folder\n"));
+
+ g_free(session->mbox);
+ session->mbox = NULL;
+
+ return ok;
+ }
+
+ return 0;
+}
+
void imap_scan_tree(Folder *folder)
{
FolderItem *item;
return new_item;
}
+static gchar *imap_folder_get_path(Folder *folder)
+{
+ gchar *folder_path;
+
+ g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(folder->account != NULL, NULL);
+
+ folder_path = g_strconcat(get_imap_cache_dir(),
+ G_DIR_SEPARATOR_S,
+ folder->account->recv_server,
+ G_DIR_SEPARATOR_S,
+ folder->account->userid,
+ NULL);
+
+ return folder_path;
+}
+
+static gchar *imap_item_get_path(Folder *folder, FolderItem *item)
+{
+ gchar *folder_path, *path;
+
+ g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(item != NULL, NULL);
+ folder_path = imap_folder_get_path(folder);
+
+ g_return_val_if_fail(folder_path != NULL, NULL);
+ if (folder_path[0] == G_DIR_SEPARATOR) {
+ if (item->path)
+ path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
+ item->path, NULL);
+ else
+ path = g_strdup(folder_path);
+ } else {
+ if (item->path)
+ path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+ folder_path, G_DIR_SEPARATOR_S,
+ item->path, NULL);
+ else
+ path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+ folder_path, NULL);
+ }
+ g_free(folder_path);
+
+ return path;
+}
+
FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
const gchar *name)
{
GSList *llast = NULL;
GString *str;
MsgInfo *msginfo;
+ GSList *seq_list, *cur;
IMAPSet imapset;
g_return_val_if_fail(session != NULL, NULL);
g_return_val_if_fail(item->folder != NULL, NULL);
g_return_val_if_fail(FOLDER_CLASS(item->folder) == &imap_class, NULL);
- imapset = numberlist_to_imapset(numlist);
- while (imapset != NULL) {
+ seq_list = imap_get_seq_set_from_numlist(numlist);
+ for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
+ imapset = cur->data;
+
if (imap_cmd_envelope(session, imapset)
!= IMAP_SUCCESS) {
log_warning(_("can't get envelope\n"));
}
g_string_free(str, TRUE);
- imapset = numberlist_to_imapset(NULL);
}
+ imap_seq_set_free(seq_list);
return newlist;
}
return msginfo;
}
+static gchar *imap_get_flag_str(IMAPFlags flags)
+{
+ GString *str;
+ gchar *ret;
+
+ str = g_string_new(NULL);
+
+ if (IMAP_IS_SEEN(flags)) g_string_append(str, "\\Seen ");
+ if (IMAP_IS_ANSWERED(flags)) g_string_append(str, "\\Answered ");
+ if (IMAP_IS_FLAGGED(flags)) g_string_append(str, "\\Flagged ");
+ if (IMAP_IS_DELETED(flags)) g_string_append(str, "\\Deleted ");
+ if (IMAP_IS_DRAFT(flags)) g_string_append(str, "\\Draft");
+
+ if (str->len > 0 && str->str[str->len - 1] == ' ')
+ g_string_truncate(str, str->len - 1);
+
+ ret = str->str;
+ g_string_free(str, FALSE);
+
+ return ret;
+}
+
static gint imap_set_message_flags(IMAPSession *session,
MsgNumberList *numlist,
IMAPFlags flags,
gboolean is_set)
{
- GString *buf;
+ gchar *cmd;
+ gchar *flag_str;
gint ok;
+ GSList *seq_list, *cur;
IMAPSet imapset;
- buf = g_string_new(is_set ? "+FLAGS (" : "-FLAGS (");
-
- if (IMAP_IS_SEEN(flags)) g_string_append(buf, "\\Seen ");
- if (IMAP_IS_ANSWERED(flags)) g_string_append(buf, "\\Answered ");
- if (IMAP_IS_FLAGGED(flags)) g_string_append(buf, "\\Flagged ");
- if (IMAP_IS_DELETED(flags)) g_string_append(buf, "\\Deleted ");
- if (IMAP_IS_DRAFT(flags)) g_string_append(buf, "\\Draft");
+ flag_str = imap_get_flag_str(flags);
+ cmd = g_strconcat(is_set ? "+FLAGS.SILENT (" : "-FLAGS.SILENT (",
+ flag_str, ")", NULL);
+ g_free(flag_str);
- if (buf->str[buf->len - 1] == ' ')
- g_string_truncate(buf, buf->len - 1);
+ seq_list = imap_get_seq_set_from_numlist(numlist);
+ for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
+ imapset = cur->data;
- g_string_append_c(buf, ')');
-
- imapset = numberlist_to_imapset(numlist);
- while (imapset != NULL) {
- ok = imap_cmd_store(session, imapset,
- buf->str);
- imapset = numberlist_to_imapset(NULL);
+ ok = imap_cmd_store(session, imapset, cmd);
}
- g_string_free(buf, TRUE);
+ imap_seq_set_free(seq_list);
+ g_free(cmd);
return ok;
}
/* low-level IMAP4rev1 commands */
+static gint imap_cmd_authenticate(IMAPSession *session, const gchar *user,
+ const gchar *pass, IMAPAuthType type)
+{
+ gchar *auth_type;
+ gint ok;
+ gchar *buf = NULL;
+ gchar *challenge;
+ gint challenge_len;
+ gchar hexdigest[33];
+ gchar *response;
+ gchar *response64;
+
+ auth_type = "CRAM-MD5";
+
+ imap_gen_send(session, "AUTHENTICATE %s", auth_type);
+ ok = imap_gen_recv(session, &buf);
+ if (ok != IMAP_SUCCESS || buf[0] != '+' || buf[1] != ' ') {
+ g_free(buf);
+ return IMAP_ERROR;
+ }
+
+ challenge = g_malloc(strlen(buf + 2) + 1);
+ challenge_len = base64_decode(challenge, buf + 2, -1);
+ challenge[challenge_len] = '\0';
+ g_free(buf);
+ log_print("IMAP< [Decoded: %s]\n", challenge);
+
+ md5_hex_hmac(hexdigest, challenge, challenge_len, pass, strlen(pass));
+ g_free(challenge);
+
+ response = g_strdup_printf("%s %s", user, hexdigest);
+ log_print("IMAP> [Encoded: %s]\n", response);
+ response64 = g_malloc((strlen(response) + 3) * 2 + 1);
+ base64_encode(response64, response, strlen(response));
+ g_free(response);
+
+ log_print("IMAP> %s\n", response64);
+ sock_puts(SESSION(session)->sock, response64);
+ ok = imap_cmd_ok(session, NULL);
+ if (ok != IMAP_SUCCESS)
+ log_warning(_("IMAP4 authentication failed.\n"));
+
+ return ok;
+}
+
static gint imap_cmd_login(IMAPSession *session,
const gchar *user, const gchar *pass)
{
session->capability = NULL;
}
-static const IMAPSet numberlist_to_imapset(MsgNumberList *list)
-{
- static GString *imapset = NULL;
- static MsgNumberList *numlist, *elem;
- guint first, last, next;
-
- if (imapset == NULL)
- imapset = g_string_sized_new(256);
- else
- g_string_truncate(imapset, 0);
-
- if (list != NULL) {
- g_slist_free(numlist);
- numlist = g_slist_copy(list);
- numlist = g_slist_sort(numlist, g_int_compare);
- } else if (numlist == NULL) {
- return NULL;
- }
-
- first = GPOINTER_TO_INT(numlist->data);
- last = first;
- for(elem = g_slist_next(numlist); elem != NULL; elem = g_slist_next(elem)) {
- next = GPOINTER_TO_INT(elem->data);
-
- if(next != (last + 1)) {
- if (imapset->len > 0)
- g_string_append(imapset, ",");
- if (first == last)
- g_string_sprintfa(imapset, "%d", first);
- else
- g_string_sprintfa(imapset, "%d:%d", first, last);
-
- if (imapset->len > IMAPCMDLIMIT) {
- last = 0;
- break;
- }
-
- first = next;
- }
- last = next;
- }
- if (last != 0) {
- if (imapset->len > 0)
- g_string_append(imapset, ",");
- if (first == last)
- g_string_sprintfa(imapset, "%d", first);
- else
- g_string_sprintfa(imapset, "%d:%d", first, last);
-
- g_slist_free(numlist);
- numlist = NULL;
- } else {
- MsgNumberList *remaining;
-
- remaining = elem->next;
- remaining = g_slist_prepend(remaining, elem->data);
- elem->next = NULL;
- g_slist_free(numlist);
- numlist = remaining;
- }
-
- return imapset->str;
-}
-
static gint imap_cmd_noop(IMAPSession *session)
{
imap_gen_send(session, "NOOP");
static gint imap_cmd_fetch(IMAPSession *session, guint32 uid, const gchar *filename)
{
gint ok;
- gchar *buf;
+ gchar *buf = NULL;
gchar *cur_pos;
gchar size_str[32];
glong size_num;
imap_gen_send(session, "UID FETCH %d BODY.PEEK[]", uid);
- while ((ok = imap_gen_recv(session, &buf))
- == IMAP_SUCCESS) {
+ while ((ok = imap_gen_recv(session, &buf)) == IMAP_SUCCESS) {
if (buf[0] != '*' || buf[1] != ' ') {
g_free(buf);
return IMAP_ERROR;
}
- if (strstr(buf, "FETCH") != NULL)
- break;
+ if (strstr(buf, "FETCH") != NULL) break;
+ g_free(buf);
}
- if (ok != IMAP_SUCCESS)
+ if (ok != IMAP_SUCCESS) {
+ g_free(buf);
return ok;
+ }
- cur_pos = strchr(buf, '{');
- if (cur_pos == NULL) {
- g_free(buf);
- return IMAP_ERROR;
+#define RETURN_ERROR_IF_FAIL(cond) \
+ if (!(cond)) { \
+ g_free(buf); \
+ return IMAP_ERROR; \
}
+
+ cur_pos = strchr(buf, '{');
+ RETURN_ERROR_IF_FAIL(cur_pos != NULL);
cur_pos = strchr_cpy(cur_pos + 1, '}', size_str, sizeof(size_str));
- if (cur_pos == NULL) {
- g_free(buf);
- return IMAP_ERROR;
- }
+ RETURN_ERROR_IF_FAIL(cur_pos != NULL);
size_num = atol(size_str);
- g_return_val_if_fail(size_num > 0, IMAP_ERROR);
+ RETURN_ERROR_IF_FAIL(size_num > 0);
- if (*cur_pos != '\0') {
- g_free(buf);
- return IMAP_ERROR;
- }
+ RETURN_ERROR_IF_FAIL(*cur_pos == '\0');
- if (recv_bytes_write_to_file(SESSION(session)->sock, size_num, filename) != 0) {
- g_free(buf);
+#undef RETURN_ERROR_IF_FAIL
+
+ g_free(buf);
+
+ if (recv_bytes_write_to_file(SESSION(session)->sock, size_num, filename) != 0)
return IMAP_ERROR;
- }
if (imap_gen_recv(session, &buf) != IMAP_SUCCESS) {
g_free(buf);
g_free(buf);
return IMAP_ERROR;
}
-
g_free(buf);
+
ok = imap_cmd_ok(session, NULL);
return ok;
}
static gint imap_cmd_append(IMAPSession *session, const gchar *destfolder,
- const gchar *file, gint32 *new_uid)
+ const gchar *file, IMAPFlags flags, gint32 *new_uid)
{
gint ok;
gint size, newuid;
gchar *destfolder_;
- gchar buf[BUFFSIZE], *imapbuf;
+ gchar *flag_str;
+ gchar *ret = NULL;
+ gchar buf[BUFFSIZE];
FILE *fp;
GPtrArray *reply;
gchar *okmsginfo;
return -1;
}
QUOTE_IF_REQUIRED(destfolder_, destfolder);
- imap_gen_send(session, "APPEND %s (\\Seen) {%d}", destfolder_, size);
+ flag_str = imap_get_flag_str(flags);
+ imap_gen_send(session, "APPEND %s (%s) {%d}",
+ destfolder_, flag_str, size);
+ g_free(flag_str);
- ok = imap_gen_recv(session, &imapbuf);
- if (ok != IMAP_SUCCESS || imapbuf[0] != '+' || imapbuf[1] != ' ') {
+ ok = imap_gen_recv(session, &ret);
+ if (ok != IMAP_SUCCESS || ret[0] != '+' || ret[1] != ' ') {
log_warning(_("can't append %s to %s\n"), file, destfolder_);
- g_free(imapbuf);
+ g_free(ret);
fclose(fp);
return IMAP_ERROR;
}
- g_free(imapbuf);
+ g_free(ret);
log_print("IMAP4> %s\n", _("(sending file...)"));
return ok;
}
-
-static gint imap_cmd_copy(IMAPSession * session,
- gint32 msgnum,
- const gchar * destfolder, gint32 * new_uid)
+static gint imap_cmd_copy(IMAPSession *session, const gchar *seq_set,
+ const gchar *destfolder, GRelation *uid_mapping)
{
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);
+ g_return_val_if_fail(seq_set != NULL, IMAP_ERROR);
+ g_return_val_if_fail(destfolder != NULL, IMAP_ERROR);
QUOTE_IF_REQUIRED(destfolder_, destfolder);
- imap_gen_send(session, "UID COPY %d %s", msgnum, destfolder_);
+ imap_gen_send(session, "UID COPY %s %s", seq_set, destfolder_);
reply = g_ptr_array_new();
- *new_uid = 0;
ok = imap_cmd_ok(session, reply);
if (ok != IMAP_SUCCESS)
- log_warning(_("can't copy %d to %s\n"), msgnum, destfolder_);
+ log_warning(_("can't copy %s to %s\n"), seq_set, destfolder_);
+/*
+ TODO: UIDPLUS
+
+ - split IMAPSets into uids
+ - g_relation_insert(uid_mapping, olduid, newuid);
+
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;
return IMAP_SUCCESS;
}
-static gint imap_cmd_store(IMAPSession *session, IMAPSet set,
+static gint imap_cmd_store(IMAPSession *session, IMAPSet seq_set,
gchar *sub_cmd)
{
gint ok;
- imap_gen_send(session, "UID STORE %s %s",
- set, sub_cmd);
+ imap_gen_send(session, "UID STORE %s %s", seq_set, sub_cmd);
if ((ok = imap_cmd_ok(session, NULL)) != IMAP_SUCCESS) {
log_warning(_("error while imap command: STORE %s %s\n"),
- set, sub_cmd);
+ seq_set, sub_cmd);
return ok;
}
return IMAP_SUCCESS;
}
+static gint imap_cmd_close(IMAPSession *session)
+{
+ gint ok;
+
+ imap_gen_send(session, "CLOSE");
+ if ((ok = imap_cmd_ok(session, NULL)) != IMAP_SUCCESS)
+ log_warning(_("error while imap command: CLOSE\n"));
+
+ return ok;
+}
+
static gint imap_cmd_ok(IMAPSession *session, GPtrArray *argbuf)
{
gint ok = IMAP_SUCCESS;
g_free(buf);
}
-static gint imap_gen_recv(IMAPSession *session, gchar **buf)
+static gint imap_gen_recv(IMAPSession *session, gchar **ret)
{
- if ((*buf = sock_getline(SESSION(session)->sock)) == NULL)
+ if ((*ret = sock_getline(SESSION(session)->sock)) == NULL)
return IMAP_SOCKET;
- strretchomp(*buf);
+ strretchomp(*ret);
- log_print("IMAP4< %s\n", *buf);
+ log_print("IMAP4< %s\n", *ret);
return IMAP_SUCCESS;
}
#endif /* !HAVE_ICONV */
}
+static GSList *imap_get_seq_set_from_numlist(MsgNumberList *numlist)
+{
+ GString *str;
+ GSList *sorted_list, *cur;
+ guint first, last, next;
+ gchar *ret_str;
+ GSList *ret_list = NULL;
+
+ if (numlist == NULL)
+ return NULL;
+
+ str = g_string_sized_new(256);
+
+ sorted_list = g_slist_copy(numlist);
+ sorted_list = g_slist_sort(sorted_list, g_int_compare);
+
+ first = GPOINTER_TO_INT(sorted_list->data);
+
+ for (cur = sorted_list; cur != NULL; cur = g_slist_next(cur)) {
+ last = GPOINTER_TO_INT(cur->data);
+ if (cur->next)
+ next = GPOINTER_TO_INT(cur->next->data);
+ else
+ next = 0;
+
+ if (last + 1 != next || next == 0) {
+ if (str->len > 0)
+ g_string_append_c(str, ',');
+ if (first == last)
+ g_string_sprintfa(str, "%u", first);
+ else
+ g_string_sprintfa(str, "%u:%u", first, last);
+
+ first = next;
+
+ if (str->len > IMAP_CMD_LIMIT) {
+ ret_str = g_strdup(str->str);
+ ret_list = g_slist_append(ret_list, ret_str);
+ g_string_truncate(str, 0);
+ }
+ }
+ }
+
+ if (str->len > 0) {
+ ret_str = g_strdup(str->str);
+ ret_list = g_slist_append(ret_list, ret_str);
+ }
+
+ g_slist_free(sorted_list);
+ g_string_free(str, TRUE);
+
+ return ret_list;
+}
+
+static GSList *imap_get_seq_set_from_msglist(MsgInfoList *msglist)
+{
+ MsgNumberList *numlist = NULL;
+ MsgInfoList *cur;
+ GSList *seq_list;
+
+ for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+ MsgInfo *msginfo = (MsgInfo *) cur->data;
+
+ numlist = g_slist_append(numlist, GINT_TO_POINTER(msginfo->msgnum));
+ }
+ seq_list = imap_get_seq_set_from_numlist(numlist);
+ g_slist_free(numlist);
+
+ return seq_list;
+}
+
+static void imap_seq_set_free(GSList *seq_list)
+{
+ slist_free_strings(seq_list);
+ g_slist_free(seq_list);
+}
+
+
static gboolean imap_rename_folder_func(GNode *node, gpointer data)
{
FolderItem *item = node->data;
projects / claws.git / blobdiff