} \
}
+typedef gchar * IMAPSet;
+
struct _IMAPFolderItem
{
FolderItem item;
guint lastuid;
+ guint uid_next;
GSList *uid_list;
};
-static GList *session_list = NULL;
+static Folder *imap_folder_new(const gchar * name, const gchar * path);
+static void imap_folder_destroy(Folder * folder);
+
+static Session *imap_session_new(const PrefsAccount * account);
+static void imap_session_authenticate(IMAPSession * session,
+ const PrefsAccount * account);
+static void imap_session_destroy(Session * session);
+
+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);
+
+static gint imap_copy_msg(Folder * folder,
+ FolderItem * dest, MsgInfo * msginfo);
+
+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_scan_folder(Folder * folder, FolderItem * item);
+static void imap_scan_tree(Folder * folder);
+
+static gint imap_create_tree(Folder * folder);
+
+static FolderItem *imap_create_folder(Folder * folder,
+ FolderItem * parent,
+ const gchar * name);
+static gint imap_rename_folder(Folder * folder,
+ FolderItem * item, const gchar * name);
+static gint imap_remove_folder(Folder * folder, FolderItem * item);
+
static gint imap_cmd_count = 0;
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 void imap_delete_all_cached_messages (FolderItem *item);
#if USE_OPENSSL
#endif
#if USE_OPENSSL
-static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type);
+static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type);
#else
static SockInfo *imap_init_sock(SockInfo *sock);
#endif
static gint imap_set_message_flags (IMAPSession *session,
- guint32 first_uid,
- guint32 last_uid,
+ MsgNumberList *numlist,
IMAPFlags flag,
gboolean is_set);
static gint imap_select (IMAPSession *session,
static void imap_get_capability (Session *session);
static gboolean imap_has_capability (IMAPSession *session,
const gchar *cap);
+static const IMAPSet numberlist_to_imapset(MsgNumberList *list);
/* low-level IMAP4rev1 commands */
static gint imap_cmd_login (SockInfo *sock,
static gint imap_cmd_delete (SockInfo *sock,
const gchar *folder);
static gint imap_cmd_envelope (SockInfo *sock,
- guint32 first_uid,
- guint32 last_uid);
-#if 0
-static gint imap_cmd_search (SockInfo *sock,
- GSList *numlist);
-#endif
+ IMAPSet set);
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);
+ 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,
+ IMAPSet set,
gchar *sub_cmd);
static gint imap_cmd_expunge (SockInfo *sock);
static gboolean imap_rename_folder_func (GNode *node,
gpointer data);
-gint imap_get_num_list (Folder *folder,
+static gint imap_get_num_list (Folder *folder,
FolderItem *item,
GSList **list);
-GSList *imap_get_msginfos (Folder *folder,
+static GSList *imap_get_msginfos (Folder *folder,
FolderItem *item,
GSList *msgnum_list);
-MsgInfo *imap_get_msginfo (Folder *folder,
+static MsgInfo *imap_get_msginfo (Folder *folder,
FolderItem *item,
gint num);
-gboolean imap_check_msgnum_validity (Folder *folder,
+static gboolean imap_check_msgnum_validity (Folder *folder,
FolderItem *item);
+static 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_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,
- NULL,
+ imap_change_flags,
};
FolderClass *imap_get_class()
Folder *folder;
folder = (Folder *)g_new0(IMAPFolder, 1);
- folder->class = &imap_class;
+ folder->klass = &imap_class;
imap_folder_init(folder, name, path);
return 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;
if(session == NULL)
return NULL;
+ if (session->sock->state == CONN_DISCONNECTED) {
+ debug_print("IMAP server disconnected\n");
+ session_destroy(session);
+ imap_reset_uid_lists(folder);
+ session = imap_session_new(folder->account);
+ }
+
/* Get CAPABILITY */
imap_get_capability(session);
log_message("IMAP connection is %s-authenticated\n",
(is_preauth) ? "pre" : "un");
- session = g_new(IMAPSession, 1);
+ session = g_new0(IMAPSession, 1);
+ session_init(SESSION(session));
SESSION(session)->type = SESSION_IMAP;
SESSION(session)->server = g_strdup(account->recv_server);
SESSION(session)->sock = imap_sock;
- SESSION(session)->connected = TRUE;
- SESSION(session)->phase = SESSION_READY;
- SESSION(session)->last_access_time = time(NULL);
- SESSION(session)->data = NULL;
SESSION(session)->destroy = imap_session_destroy;
session->mbox = NULL;
session->authenticated = is_preauth;
- session_list = g_list_append(session_list, session);
-
return SESSION(session);
}
g_free(IMAP_SESSION(session)->mbox);
g_strfreev(IMAP_SESSION(session)->capability);
-
- session_list = g_list_remove(session_list, session);
-}
-
-void imap_session_destroy_all(void)
-{
- while (session_list != NULL) {
- IMAPSession *session = (IMAPSession *)session_list->data;
-
- imap_cmd_logout(SESSION(session)->sock);
- session_destroy(SESSION(session));
- }
}
gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
{
gchar *destdir;
IMAPSession *session;
- gint ok;
+ gint ok, newuid;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
if (!session) 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) {
FILE_OP_ERROR(file, "unlink");
}
- return 0;
+ return newuid;
}
static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
{
gchar *destdir;
IMAPSession *session;
- IMAPFlags iflags = 0;
- gint messages, recent, unseen;
- guint32 newuid = 0, uid_validity;
+ guint32 newuid = 0;
gint ok;
-
+
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);
return -1;
}
- /* if we don't have UIDPLUS we get UID-NEXT and hope that the
- message really gets this uid */
- if (!imap_has_capability(session, "UIDPLUS")) {
- ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
- &messages, &recent, &newuid, &uid_validity, &unseen);
- if (ok != IMAP_SUCCESS) {
- g_warning("can't copy message\n");
- return -1;
- }
- }
-
destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
/* ensure source folder selected */
ok = imap_cmd_copy(session, msginfo->msgnum, destdir, &newuid);
if (ok == IMAP_SUCCESS && remove_source) {
- imap_set_message_flags(session, msginfo->msgnum, msginfo->msgnum,
+ MsgNumberList numlist;
+
+ numlist.next = NULL;
+ numlist.data = GINT_TO_POINTER(msginfo->msgnum);
+
+ imap_set_message_flags(session, &numlist,
IMAP_FLAG_DELETED, TRUE);
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);
if (ok == IMAP_SUCCESS)
return -1;
}
-#if 0
-static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
- GSList *msglist,
- gboolean remove_source)
-{
- gchar *destdir;
- GSList *cur;
- MsgInfo *msginfo;
- IMAPSession *session;
- gint ok = IMAP_SUCCESS;
-
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
-
- session = imap_session_get(folder);
- if (!session) return -1;
-
- destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
-
- for (cur = msglist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
-
- if (msginfo->folder == dest) {
- 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);
-
- if (remove_source)
- debug_print("Moving message %s%c%d 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, destdir);
-
- if (ok == IMAP_SUCCESS && remove_source) {
- imap_set_message_flags
- (session, msginfo->msgnum, msginfo->msgnum,
- IMAP_FLAG_DELETED, TRUE);
- }
- }
-
- if (remove_source)
- ok = imap_cmd_expunge(SESSION(session)->sock);
-
- g_free(destdir);
-
- if (ok == IMAP_SUCCESS)
- return 0;
- else
- return -1;
-}
-#endif
-
-gint imap_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
-{
- gchar *srcfile;
- gint ret = 0;
-
- 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(msginfo->folder != NULL, -1);
-
- if (folder == msginfo->folder->folder)
- return imap_do_copy(folder, dest, msginfo, TRUE);
-
- srcfile = procmsg_get_message_file(msginfo);
- if (!srcfile) return -1;
-
- ret = imap_add_msg(folder, dest, srcfile, FALSE);
- g_free(srcfile);
-
- if (ret != -1) {
- if(folder_item_remove_msg(msginfo->folder, msginfo->msgnum)) {
- ret = -1;
- }
- }
-
- return ret;
-}
-
-#if 0
-gint imap_move_msgs_with_dest(Folder *folder, FolderItem *dest,
- GSList *msglist)
-{
- MsgInfo *msginfo;
- GSList *cur;
- gint ret = 0;
-
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
-
- msginfo = (MsgInfo *)msglist->data;
- if (folder == msginfo->folder->folder)
- return imap_do_copy_msgs_with_dest(folder, dest, msglist, TRUE);
-
- for (cur = msglist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- ret = imap_move_msg(folder, dest, msginfo);
- if (ret == -1) break;
- }
-
- return ret;
-}
-#endif
-
gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
gchar *srcfile;
return ret;
}
-#if 0
-gint imap_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
- GSList *msglist)
-{
- MsgInfo *msginfo;
- GSList *cur;
- gint ret = 0;
-
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
-
- msginfo = (MsgInfo *)msglist->data;
- if (folder == msginfo->folder->folder)
- return imap_do_copy_msgs_with_dest
- (folder, dest, msglist, FALSE);
-
- for (cur = msglist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- ret = imap_copy_msg(folder, dest, msginfo);
- if (ret == -1) break;
- }
-
- return ret;
-}
-#endif
-
gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
{
gint ok;
IMAPSession *session;
gchar *dir;
-
+ MsgNumberList numlist;
+
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
g_return_val_if_fail(item != NULL, -1);
if (ok != IMAP_SUCCESS)
return ok;
+ numlist.next = NULL;
+ numlist.data = GINT_TO_POINTER(uid);
+
ok = imap_set_message_flags
(IMAP_SESSION(REMOTE_FOLDER(folder)->session),
- (guint32)uid, (guint32)uid, IMAP_FLAG_DELETED, TRUE);
+ &numlist, IMAP_FLAG_DELETED, TRUE);
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: %d\n"), uid);
return ok;
return IMAP_SUCCESS;
}
-gint imap_remove_msgs(Folder *folder, FolderItem *item, GSList *msglist)
-{
- gint ok;
- IMAPSession *session;
- gchar *dir;
- MsgInfo *msginfo;
- GSList *cur;
- guint32 uid;
-
- g_return_val_if_fail(folder != NULL, -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);
-
- session = imap_session_get(folder);
- if (!session) return -1;
-
- ok = imap_select(session, IMAP_FOLDER(folder), item->path,
- NULL, NULL, NULL, NULL);
- if (ok != IMAP_SUCCESS)
- return ok;
-
- for (cur = msglist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- uid = msginfo->msgnum;
- ok = imap_set_message_flags
- (IMAP_SESSION(REMOTE_FOLDER(folder)->session),
- uid, uid, IMAP_FLAG_DELETED, TRUE);
- if (ok != IMAP_SUCCESS) {
- log_warning(_("can't set deleted flags: %d\n"), uid);
- return ok;
- }
- }
-
- ok = imap_cmd_expunge(SESSION(session)->sock);
- if (ok != IMAP_SUCCESS) {
- log_warning(_("can't expunge\n"));
- return ok;
- }
-
- dir = folder_item_get_path(item);
- if (is_dir_exist(dir)) {
- for (cur = msglist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- uid = msginfo->msgnum;
- remove_numbered_files(dir, uid, uid);
- }
- }
- g_free(dir);
-
- return IMAP_SUCCESS;
-}
-
gint imap_remove_all_msg(Folder *folder, FolderItem *item)
{
gint exists, recent, unseen;
&messages, &recent, &uid_next, &uid_validity, &unseen);
if (ok != IMAP_SUCCESS) return -1;
- item->new = unseen > 0 ? recent : 0;
- item->unread = unseen;
- item->total = messages;
+ item->new_msgs = unseen > 0 ? recent : 0;
+ item->unread_msgs = unseen;
+ item->total_msgs = messages;
item->last_num = (messages > 0 && uid_next > 0) ? uid_next - 1 : 0;
/* item->mtime = uid_validity; */
static GSList *imap_get_uncached_messages(IMAPSession *session,
FolderItem *item,
- guint32 first_uid, guint32 last_uid)
+ MsgNumberList *numlist)
{
gchar *tmp;
GSList *newlist = NULL;
g_return_val_if_fail(item != NULL, NULL);
g_return_val_if_fail(item->folder != NULL, 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)
+ if (imap_cmd_envelope(SESSION(session)->sock, numberlist_to_imapset(numlist))
!= IMAP_SUCCESS) {
log_warning(_("can't get envelope\n"));
return NULL;
{
SockInfo *sock;
- if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL)
+ if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL) {
log_warning(_("Can't establish IMAP4 session with: %s\n"),
server);
return NULL;
+ }
#if USE_OPENSSL
return imap_init_sock(sock, ssl_type);
#else
}
#endif
- if (imap_cmd_noop(sock) != IMAP_SUCCESS) {
- log_warning(_("Can't establish IMAP4 session.\n"));
- sock_close(sock);
- return NULL;
- }
-
return sock;
}
return msginfo;
}
-gint imap_msg_set_perm_flags(MsgInfo *msginfo, MsgPermFlags flags)
-{
- Folder *folder;
- IMAPSession *session;
- IMAPFlags iflags = 0;
- gint ok = IMAP_SUCCESS;
-
- g_return_val_if_fail(msginfo != NULL, -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_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) {
- ok = imap_set_message_flags(session, msginfo->msgnum,
- msginfo->msgnum, iflags, TRUE);
- if (ok != IMAP_SUCCESS) return ok;
- }
-
- if (flags & MSG_UNREAD)
- ok = imap_set_message_flags(session, msginfo->msgnum,
- msginfo->msgnum, IMAP_FLAG_SEEN,
- FALSE);
- return ok;
-}
-
-gint imap_msg_unset_perm_flags(MsgInfo *msginfo, MsgPermFlags flags)
-{
- Folder *folder;
- IMAPSession *session;
- IMAPFlags iflags = 0;
- gint ok = IMAP_SUCCESS;
-
- g_return_val_if_fail(msginfo != NULL, -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_CLASS(folder) == &imap_class, -1);
-
- session = imap_session_get(folder);
- if (!session) return -1;
-
- if (flags & MSG_MARKED) iflags |= IMAP_FLAG_FLAGGED;
- if (flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
- if (iflags) {
- ok = imap_set_message_flags(session, msginfo->msgnum,
- msginfo->msgnum, iflags, FALSE);
- if (ok != IMAP_SUCCESS) return ok;
- }
-
- if (flags & MSG_UNREAD)
- ok = imap_set_message_flags(session, msginfo->msgnum,
- msginfo->msgnum, IMAP_FLAG_SEEN,
- TRUE);
- return ok;
-}
-
static gint imap_set_message_flags(IMAPSession *session,
- guint32 first_uid,
- guint32 last_uid,
+ MsgNumberList *numlist,
IMAPFlags flags,
gboolean is_set)
{
g_string_append_c(buf, ')');
- ok = imap_cmd_store(SESSION(session)->sock, first_uid, last_uid,
+ ok = imap_cmd_store(SESSION(session)->sock, numberlist_to_imapset(numlist),
buf->str);
g_string_free(buf, TRUE);
return FALSE;
}
+static const IMAPSet numberlist_to_imapset(MsgNumberList *list)
+{
+ static GString *imapset = NULL;
+ MsgNumberList *numlist, *elem;
+ guint first, last, next;
+
+ if (imapset == NULL)
+ imapset = g_string_sized_new(256);
+ else
+ g_string_truncate(imapset, 0);
+
+ numlist = g_slist_copy(list);
+ numlist = g_slist_sort(numlist, g_int_compare);
+
+ 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);
+
+ first = next;
+ }
+ last = next;
+ }
+ 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);
+
+ return imapset->str;
+}
+
static gint imap_cmd_noop(SockInfo *sock)
{
imap_cmd_gen_send(sock, "NOOP");
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], *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, &imapbuf);
+ 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);
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);
return -1;
}
}
if (ferror(fp)) {
FILE_OP_ERROR(file, "fgets");
fclose(fp);
- sock_close(sock);
return -1;
}
- sock_puts(sock, "");
+ sock_puts(SESSION(session)->sock, "");
fclose(fp);
- return imap_cmd_ok(sock, NULL);
-}
-
-#if 0
-static void imap_uidplus_copy(IMAPSession *session, MsgInfo *msginfo,
- const gchar *destfolder, const gchar *okmsginfo)
-{
- unsigned int olduid, newuid;
- IMAPFlags iflags = 0;
-
- if (okmsginfo == NULL)
- return;
-
- if (sscanf(okmsginfo, "%*u OK [COPYUID %*llu %u %u]", &olduid, &newuid) != 2)
- return;
-
- if (olduid != msginfo->msgnum) /* this should NEVER happen */
- return;
- if (imap_select(session, IMAP_FOLDER(msginfo->folder->folder), destfolder,
- NULL, NULL, NULL, NULL) != IMAP_SUCCESS)
- return;
-
- if (msginfo->flags.perm_flags & MSG_MARKED) iflags |= IMAP_FLAG_FLAGGED;
- if (msginfo->flags.perm_flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
- if (iflags)
- imap_set_message_flags(session, newuid, newuid, iflags, TRUE);
+ reply = g_ptr_array_new();
- if (msginfo->flags.perm_flags & MSG_UNREAD)
- imap_set_message_flags(session, newuid, newuid, IMAP_FLAG_SEEN, FALSE);
+ *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;
+ }
- imap_select(session, IMAP_FOLDER(msginfo->folder->folder), msginfo->folder->path,
- NULL, NULL, NULL, NULL);
+ ptr_array_free_strings(reply);
+ g_ptr_array_free(reply, TRUE);
+ return ok;
}
-#endif
-static gint imap_cmd_copy(IMAPSession *session,
- gint32 msgnum, const gchar *destfolder, gint32 *new_uid)
+
+static gint imap_cmd_copy(IMAPSession * session,
+ gint32 msgnum,
+ const gchar * destfolder, gint32 * new_uid)
{
gint ok;
gint32 olduid, newuid;
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_);
return ok;
}
-gint imap_cmd_envelope(SockInfo *sock, guint32 first_uid, guint32 last_uid)
+gint imap_cmd_envelope(SockInfo *sock, IMAPSet set)
{
static GString *header_fields = NULL;
}
imap_cmd_gen_send
- (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE BODY.PEEK[HEADER.FIELDS (%s)])",
- first_uid, last_uid,
- header_fields->str);
+ (sock, "UID FETCH %s (UID FLAGS RFC822.SIZE BODY.PEEK[HEADER.FIELDS (%s)])",
+ set, header_fields->str);
return IMAP_SUCCESS;
}
-static gint imap_cmd_store(SockInfo *sock, guint32 first_uid, guint32 last_uid,
+static gint imap_cmd_store(SockInfo *sock, IMAPSet set,
gchar *sub_cmd)
{
gint ok;
- imap_cmd_gen_send(sock, "UID STORE %d:%d %s",
- first_uid, last_uid, sub_cmd);
+ imap_cmd_gen_send(sock, "UID STORE %s %s",
+ set, sub_cmd);
if ((ok = imap_cmd_ok(sock, NULL)) != IMAP_SUCCESS) {
- log_warning(_("error while imap command: STORE %d:%d %s\n"),
- first_uid, last_uid, sub_cmd);
+ log_warning(_("error while imap command: STORE %s %s\n"),
+ set, sub_cmd);
return ok;
}
} else
log_print("IMAP4> %d %s\n", imap_cmd_count, tmp);
- sock_write(sock, buf, strlen(buf));
+ sock_write_all(sock, buf, strlen(buf));
}
static gint imap_cmd_gen_recv(SockInfo *sock, gchar **buf)
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, lastuid_old, nummsgs = 0, exists, resent, unseen, uid_val;
GSList *uidlist, *elem;
- gchar *dir, *cmd_buf;
-
- 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);
+ gchar *cmd_buf;
session = imap_session_get(folder);
g_return_val_if_fail(session != NULL, -1);
ok = imap_select(session, IMAP_FOLDER(folder), item->item.path,
- &exists, &resent, &unseen, &uid_val);
+ NULL, NULL, NULL, NULL);
if (ok != IMAP_SUCCESS)
return -1;
- if (exists == 0)
- return 0;
-
cmd_buf = g_strdup_printf("UID %d:*", item->lastuid + 1);
ok = imap_cmd_search(SESSION(session)->sock, cmd_buf, &uidlist);
g_free(cmd_buf);
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 (elem = uidlist; elem != NULL; elem = g_slist_next(elem)) {
}
g_slist_free(uidlist);
- if (g_slist_length(item->uid_list) != exists) {
+ 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 */
+ 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);
g_slist_free(*msgnum_list);
- return imap_get_num_list(folder, _item, 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);
remove_numbered_files_not_in_list(dir, *msgnum_list);
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;
+ MsgInfoList *ret = NULL;
+ gint ok;
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
if (ok != IMAP_SUCCESS)
return NULL;
- sorted_list = g_slist_sort(g_slist_copy(msgnum_list), compare_uint);
+ if (!(item->stype == F_QUEUE || item->stype == F_DRAFT)) {
+ ret = g_slist_concat(ret,
+ imap_get_uncached_messages(
+ session, item, msgnum_list));
+ } else {
+ MsgNumberList *sorted_list, *elem;
+ gint startnum, lastnum;
+
+ sorted_list = g_slist_sort(g_slist_copy(msgnum_list), g_int_compare);
- startnum = lastnum = GPOINTER_TO_INT(sorted_list->data);
+ startnum = lastnum = GPOINTER_TO_INT(sorted_list->data);
- for (elem = sorted_list;; elem = g_slist_next(elem)) {
- guint num;
+ for (elem = sorted_list;; elem = g_slist_next(elem)) {
+ guint num;
- if (elem)
- num = GPOINTER_TO_INT(elem->data);
+ 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 {
+ if (num > lastnum + 1 || elem == NULL) {
int i;
for (i = startnum; i <= lastnum; ++i) {
gchar *file;
g_free(file);
}
}
- }
- if (elem == NULL)
- break;
+ if (elem == NULL)
+ break;
- startnum = num;
+ startnum = num;
+ }
+ lastnum = num;
}
- lastnum = num;
- }
- g_slist_free(sorted_list);
+ 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);
+ MsgInfo *msginfo;
+ MsgInfoList *msginfolist;
+ MsgNumberList numlist;
- ok = imap_select(session, IMAP_FOLDER(folder), item->path,
- NULL, NULL, NULL, NULL);
- if (ok != IMAP_SUCCESS)
- return NULL;
+ numlist.next = NULL;
+ numlist.data = GINT_TO_POINTER(uid);
- if (!(item->stype == F_QUEUE || item->stype == F_DRAFT)) {
- GSList *list;
+ msginfolist = imap_get_msginfos(folder, item, &numlist);
+ msginfo = msginfolist->data;
+ g_slist_free(msginfolist);
- list = imap_get_uncached_messages(session, item, uid, uid);
- if (list) {
- msginfo = (MsgInfo *)list->data;
- list->data = NULL;
- }
- procmsg_msg_list_free(list);
- } else {
- gchar *file;
-
- file = imap_fetch_msg(folder, item, uid);
- if (file != NULL) {
- msginfo = imap_parse_msg(file, item);
- if (msginfo != NULL)
- msginfo->msgnum = uid;
- g_free(file);
- }
- }
-
return msginfo;
}
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;
+ MsgNumberList numlist;
+
+ g_return_if_fail(folder != NULL);
+ g_return_if_fail(folder->klass == &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;
+
+ numlist.next = NULL;
+ numlist.data = GINT_TO_POINTER(msginfo->msgnum);
+
+ if (flags_set) {
+ ok = imap_set_message_flags(session, &numlist, flags_set, TRUE);
+ if (ok != IMAP_SUCCESS) return;
+ }
+
+ if (flags_unset) {
+ ok = imap_set_message_flags(session, &numlist, flags_unset, FALSE);
+ if (ok != IMAP_SUCCESS) return;
+ }
+
+ msginfo->flags.perm_flags = newflags;
+
+ return;
+}
projects / claws.git / blobdiff