/*
* 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"
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,
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_append (SockInfo *sock,
const gchar *destfolder,
const gchar *file);
-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);
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);
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->get_num_list = imap_get_num_list;
folder->get_msginfo = imap_get_msginfo;
+ folder->get_msginfos = imap_get_msginfos;
}
static FolderItem *imap_folder_item_new(Folder *folder)
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);
: IMAP4_PORT;
#endif
- if (!rfolder->session) {
- rfolder->session =
- imap_session_new(folder->account);
- if (rfolder->session) {
- if (!IMAP_SESSION(rfolder->session)->authenticated)
- imap_session_authenticate(IMAP_SESSION(rfolder->session), folder->account);
- if (IMAP_SESSION(rfolder->session)->authenticated) {
- imap_parse_namespace(IMAP_SESSION(rfolder->session),
- IMAP_FOLDER(folder));
- rfolder->session->last_access_time = time(NULL);
- imap_reset_uid_lists(folder);
- } else {
- session_destroy(rfolder->session);
- rfolder->session = NULL;
- }
- }
- 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);
- 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) {
- if (!IMAP_SESSION(rfolder->session)->authenticated)
- imap_session_authenticate(IMAP_SESSION(rfolder->session), folder->account);
- if (IMAP_SESSION(rfolder->session)->authenticated) {
- imap_parse_namespace(IMAP_SESSION(rfolder->session),
- IMAP_FOLDER(folder));
- rfolder->session->last_access_time = time(NULL);
- 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 {
- session_destroy(rfolder->session);
+ 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);
- 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)
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;
SESSION(session)->destroy = imap_session_destroy;
+ session->capability = NULL;
+
session->mbox = NULL;
session->authenticated = is_preauth;
g_free(IMAP_SESSION(session)->mbox);
+ g_strfreev(IMAP_SESSION(session)->capability);
+
session_list = g_list_remove(session_list, session);
}
{
gchar *destdir;
IMAPSession *session;
- gint messages, recent, unseen;
- guint32 uid_next, uid_validity;
gint ok;
g_return_val_if_fail(folder != 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);
- 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);
g_free(destdir);
FILE_OP_ERROR(file, "unlink");
}
- return uid_next;
+ return 0;
}
static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
{
gchar *destdir;
IMAPSession *session;
+ IMAPFlags iflags = 0;
gint messages, recent, unseen;
- guint32 uid_next, uid_validity;
+ guint32 newuid = 0, uid_validity;
gint ok;
g_return_val_if_fail(folder != NULL, -1);
return -1;
}
- ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
- &messages, &recent, &uid_next, &uid_validity, &unseen);
- if (ok != IMAP_SUCCESS) {
- g_warning("can't copy message\n");
- 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);
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);
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->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
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)
{
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) {
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"));
- imap_get_namespace_by_list(session, folder);
return;
}
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(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);
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);
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");
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;
gint ok;
gint size;
gchar *destfolder_;
- gchar buf[BUFFSIZE];
+ gchar buf[BUFFSIZE], *imapbuf;
FILE *fp;
g_return_val_if_fail(file != NULL, IMAP_ERROR);
QUOTE_IF_REQUIRED(destfolder_, destfolder);
imap_cmd_gen_send(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(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...)"));
return imap_cmd_ok(sock, NULL);
}
-static gint imap_cmd_copy(SockInfo *sock, guint32 uid, const gchar *destfolder)
+#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);
+
+ if (msginfo->flags.perm_flags & MSG_UNREAD)
+ imap_set_message_flags(session, newuid, newuid, IMAP_FLAG_SEEN, FALSE);
+
+ imap_select(session, IMAP_FOLDER(msginfo->folder->folder), msginfo->folder->path,
+ NULL, NULL, NULL, NULL);
+}
+#endif
+
+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();
+ 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 %*llu %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);
+
+ while(namelen && (elem->name[namelen - 1] == ' ' ||
+ 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;
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) {
- g_warning("iconv cannot convert UTF-7 to %s\n",
+ 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);
g_free(to_str);
*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;
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",
conv_get_current_charset_str());
g_string_free(to_str, FALSE);
return to;
-#endif
+#endif /* !HAVE_ICONV */
}
static gboolean imap_rename_folder_func(GNode *node, gpointer data)
{
IMAPFolderItem *item = (IMAPFolderItem *)_item;
IMAPSession *session;
- gint ok, i, lastuid_old, nummsgs = 0;
+ gint ok, i, lastuid_old, nummsgs = 0, exists, resent, unseen, uid_val;
GPtrArray *argbuf;
gchar *cmdbuf = NULL;
gchar *dir;
g_return_val_if_fail(session != NULL, -1);
ok = imap_select(session, IMAP_FOLDER(folder), item->item.path,
- NULL, NULL, NULL, NULL);
+ &exists, &resent, &unseen, &uid_val);
if (ok != IMAP_SUCCESS)
return -1;
+ if (exists == 0)
+ return 0;
+
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)");
+ cmdbuf = g_strdup("UID SEARCH ALL");
}
imap_cmd_gen_send(SESSION(session)->sock, cmdbuf);
g_free(cmdbuf);
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;
- }
+
+ if (!strncmp(g_ptr_array_index(argbuf, i), "SEARCH ", 7)) {
+ gchar **p, **list = g_strsplit(g_ptr_array_index(argbuf, i) + 7, " ", 0);
+
+ for (p = list; *p != NULL; ++p)
+ if (sscanf(*p, "%d", &msgnum) == 1 && 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_strfreev(list);
+
+ } else if((ret = sscanf(g_ptr_array_index(argbuf, i),
+ "%d FETCH (UID %d)", &msgidx, &msgnum)) == 2 &&
+ 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;
}
+
}
dir = folder_item_get_path((FolderItem *)item);
remove_numbered_files_not_in_list(dir, *msgnum_list);
g_free(dir);
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+
return nummsgs;
}
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;