static IMAPSession *imap_session_get (Folder *folder);
static gint imap_scan_tree_recursive (IMAPSession *session,
- FolderItem *item,
- IMAPNameSpace *namespace);
-static GSList *imap_parse_list (IMAPSession *session,
+ FolderItem *item);
+static GSList *imap_parse_list (Folder *folder,
+ IMAPSession *session,
const gchar *real_path);
static void imap_create_missing_folders (Folder *folder);
#if USE_SSL
static SockInfo *imap_open (const gchar *server,
gushort port,
- gboolean use_ssl);
+ SSLType ssl_type);
#else
static SockInfo *imap_open (const gchar *server,
gushort port);
#endif
+#if USE_SSL
+static SockInfo *imap_open_tunnel(const gchar *server,
+ const gchar *tunnelcmd,
+ SSLType ssl_type);
+#else
static SockInfo *imap_open_tunnel(const gchar *server,
const gchar *tunnelcmd);
+#endif
+#if USE_SSL
+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,
IMAPFolder *folder);
static IMAPNameSpace *imap_find_namespace (IMAPFolder *folder,
const gchar *path);
+static gchar imap_get_path_separator (IMAPFolder *folder,
+ const gchar *path);
static gchar *imap_get_real_path (IMAPFolder *folder,
const gchar *path);
gchar *dest,
gint dest_len,
GString *str);
-static gchar *imap_parse_one_address (SockInfo *sock,
- gchar *start,
- gchar *out_from_str,
- gchar *out_fromname_str,
- GString *str);
-static gchar *imap_parse_address (SockInfo *sock,
- gchar *start,
- gchar **out_from_str,
- gchar **out_fromname_str,
- GString *str);
static MsgFlags imap_parse_flags (const gchar *flag_str);
static MsgInfo *imap_parse_envelope (SockInfo *sock,
+ FolderItem *item,
GString *line_str);
static gint imap_greeting (SockInfo *sock,
gboolean *is_preauth);
const gchar *pass);
static gint imap_cmd_logout (SockInfo *sock);
static gint imap_cmd_noop (SockInfo *sock);
+static gint imap_cmd_starttls (SockInfo *sock);
static gint imap_cmd_namespace (SockInfo *sock,
gchar **ns_str);
static gint imap_cmd_list (SockInfo *sock,
static gboolean imap_rename_folder_func (GNode *node,
gpointer data);
+GSList *imap_get_num_list (Folder *folder,
+ FolderItem *item);
+MsgInfo *imap_fetch_msginfo (Folder *folder,
+ FolderItem *item,
+ gint num);
+gboolean imap_check_msgnum_validity (Folder *folder,
+ FolderItem *item);
Folder *imap_folder_new(const gchar *name, const gchar *path)
{
static void imap_folder_init(Folder *folder, const gchar *name,
const gchar *path)
{
- folder_remote_folder_init(folder, name, path);
-
folder->type = F_IMAP;
+ folder_remote_folder_init(folder, name, path);
+
+/*
folder->get_msg_list = imap_get_msg_list;
- 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_all_msg = imap_remove_all_msg;
- folder->is_msg_changed = imap_is_msg_changed;
+*/
+ 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_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->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->check_msgnum_validity = imap_check_msgnum_validity;
+
+ folder->get_num_list = imap_get_num_list;
+ folder->fetch_msginfo = imap_fetch_msginfo;
+}
+
+FolderItem *imap_folder_item_new()
+{
+ IMAPFolderItem *item;
+
+ item = g_new0(IMAPFolderItem, 1);
+ item->lastuid = 0;
+ item->uid_list = NULL;
+
+ return (FolderItem *)item;
+}
+
+void imap_folder_item_destroy(FolderItem *_item)
+{
+ IMAPFolderItem *item = (IMAPFolderItem *)_item;
+
+ g_return_if_fail(item != NULL);
+ g_slist_free(item->uid_list);
+}
+
+static gboolean imap_reset_uid_lists_func(GNode *node, gpointer data)
+{
+ IMAPFolderItem *item = (IMAPFolderItem *)node->data;
+
+ item->lastuid = 0;
+ g_slist_free(item->uid_list);
+ item->uid_list = NULL;
+
+ return FALSE;
+}
+
+static void imap_reset_uid_lists(Folder *folder)
+{
+ /* Destroy all uid lists and rest last uid */
+ g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, imap_reset_uid_lists_func, NULL);
}
static IMAPSession *imap_session_get(Folder *folder)
#if USE_SSL
port = folder->account->set_imapport ? folder->account->imapport
- : folder->account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
+ : folder->account->ssl_imap == SSL_TUNNEL
+ ? IMAPS_PORT : IMAP4_PORT;
#else
port = folder->account->set_imapport ? folder->account->imapport
: IMAP4_PORT;
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);
session_destroy(rfolder->session);
rfolder->session =
imap_session_new(folder->account);
- if (rfolder->session)
+ if (rfolder->session) {
imap_parse_namespace(IMAP_SESSION(rfolder->session),
IMAP_FOLDER(folder));
+ imap_reset_uid_lists(folder);
+ }
}
if (rfolder->session)
#ifdef USE_SSL
/* FIXME: IMAP over SSL only... */
- gboolean use_ssl;
+ SSLType ssl_type;
port = account->set_imapport ? account->imapport
: account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
- use_ssl = account->ssl_imap ? TRUE : FALSE;
+ ssl_type = account->ssl_imap ? TRUE : FALSE;
#else
port = account->set_imapport ? account->imapport
: IMAP4_PORT;
if (account->set_tunnelcmd) {
log_message(_("creating tunneled IMAP4 connection\n"));
+#if USE_SSL
+ if ((imap_sock = imap_open_tunnel(account->recv_server,
+ account->tunnelcmd,
+ ssl_type)) == NULL)
+#else
if ((imap_sock = imap_open_tunnel(account->recv_server,
account->tunnelcmd)) == NULL)
+#endif
return NULL;
} else {
g_return_val_if_fail(account->recv_server != NULL, NULL);
#if USE_SSL
if ((imap_sock = imap_open(account->recv_server, port,
- use_ssl)) == NULL)
+ ssl_type)) == NULL)
#else
if ((imap_sock = imap_open(account->recv_server, port)) == NULL)
#endif
{
gchar *destdir;
IMAPSession *session;
+ gint messages, recent, unseen;
+ guint32 uid_next, 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);
+ statusbar_pop_all();
+ if (ok != IMAP_SUCCESS) {
+ g_warning(_("can't copy message\n"));
+ return -1;
+ }
+
destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
if (remove_source)
statusbar_pop_all();
if (ok == IMAP_SUCCESS)
- return 0;
+ return uid_next;
else
return -1;
}
ret = imap_add_msg(folder, dest, srcfile, FALSE);
g_free(srcfile);
- if (ret == 0)
- ret = folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
-
+ if (ret != -1) {
+ if(folder_item_remove_msg(msginfo->folder, msginfo->msgnum)) {
+ ret = -1;
+ }
+ }
+
return ret;
}
for (cur = msglist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
ret = imap_move_msg(folder, dest, msginfo);
- if (ret != 0) break;
+ if (ret == -1) break;
}
return ret;
for (cur = msglist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
ret = imap_copy_msg(folder, dest, msginfo);
- if (ret != 0) break;
+ if (ret == -1) break;
}
return ret;
void imap_scan_tree(Folder *folder)
{
- IMAPFolder *imapfolder = IMAP_FOLDER(folder);
FolderItem *item;
IMAPSession *session;
- IMAPNameSpace *namespace = NULL;
gchar *root_folder = NULL;
g_return_if_fail(folder != NULL);
session = imap_session_get(folder);
if (!session) return;
- if (imapfolder->ns_personal && imapfolder->ns_personal->data)
- namespace = (IMAPNameSpace *)imapfolder->ns_personal->data;
-
if (folder->account->imap_dir && *folder->account->imap_dir) {
- gchar *imap_dir;
- Xstrdup_a(imap_dir, folder->account->imap_dir, return);
- strtailchomp(imap_dir, '/');
- root_folder = g_strconcat
- (namespace && namespace->name ? namespace->name : "",
- imap_dir, NULL);
- if (namespace && namespace->separator)
- subst_char(root_folder, namespace->separator, '/');
- }
-
- if (root_folder)
+ Xstrdup_a(root_folder, folder->account->imap_dir, return);
+ strtailchomp(root_folder, '/');
debug_print("IMAP root directory: %s\n", root_folder);
+ }
folder_tree_destroy(folder);
- item = folder_item_new(folder->name, root_folder);
+ item = folder_item_new(folder, folder->name, root_folder);
item->folder = folder;
folder->node = g_node_new(item);
- g_free(root_folder);
- imap_scan_tree_recursive(session, item, namespace);
+ imap_scan_tree_recursive(session, item);
imap_create_missing_folders(folder);
}
-static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item,
- IMAPNameSpace *namespace)
+static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
{
Folder *folder;
IMAPFolder *imapfolder;
GSList *item_list, *cur;
gchar *real_path;
gchar *wildcard_path;
- gchar separator = '/';
+ gchar separator;
gchar wildcard[3];
g_return_val_if_fail(item != NULL, -1);
folder = FOLDER(item->folder);
imapfolder = IMAP_FOLDER(folder);
- if (namespace && namespace->separator)
- separator = namespace->separator;
+ separator = imap_get_path_separator(imapfolder, item->path);
if (item->folder->ui_func)
item->folder->ui_func(folder, item, folder->ui_func_data);
} else {
wildcard[0] = '%';
wildcard[1] = '\0';
- real_path = g_strdup(namespace && namespace->name &&
- strncmp(namespace->name, "INBOX", 5) != 0
- ? namespace->name : "");
+ real_path = g_strdup("");
}
Xstrcat_a(wildcard_path, real_path, wildcard,
wildcard_path);
strtailchomp(real_path, separator);
- item_list = imap_parse_list(session, real_path);
+ item_list = imap_parse_list(folder, session, real_path);
g_free(real_path);
for (cur = item_list; cur != NULL; cur = cur->next) {
if (new_item->no_select == FALSE)
imap_scan_folder(folder, new_item);
if (new_item->no_sub == FALSE)
- imap_scan_tree_recursive(session, new_item, namespace);
+ imap_scan_tree_recursive(session, new_item);
}
return IMAP_SUCCESS;
}
-static GSList *imap_parse_list(IMAPSession *session, const gchar *real_path)
+static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar *real_path)
{
gchar buf[IMAPBUFSIZE];
gchar flags[256];
loc_name = imap_modified_utf7_to_locale(name);
loc_path = imap_modified_utf7_to_locale(buf);
- new_item = folder_item_new(loc_name, loc_path);
+ new_item = folder_item_new(folder, loc_name, loc_path);
if (strcasestr(flags, "\\Noinferiors") != NULL)
new_item->no_sub = TRUE;
if (strcmp(buf, "INBOX") != 0 &&
{
gchar *dirpath, *imap_path;
IMAPSession *session;
- IMAPNameSpace *namespace;
FolderItem *new_item;
+ gchar separator;
gchar *new_name;
const gchar *p;
gint ok;
} else
dirpath = g_strdup(name);
- strtailchomp(dirpath, '/');
+ /* keep trailing directory separator to create a folder that contains
+ sub folder */
imap_path = imap_locale_to_modified_utf7(dirpath);
+ strtailchomp(dirpath, '/');
Xstrdup_a(new_name, name, {g_free(dirpath); return NULL;});
strtailchomp(new_name, '/');
- namespace = imap_find_namespace(IMAP_FOLDER(folder), imap_path);
- if (namespace && namespace->separator) {
- imap_path_separator_subst(imap_path, namespace->separator);
- subst_char(new_name, '/', namespace->separator);
- }
+ separator = imap_get_path_separator(IMAP_FOLDER(folder), imap_path);
+ imap_path_separator_subst(imap_path, separator);
+ subst_char(new_name, '/', separator);
if (strcmp(name, "INBOX") != 0) {
GPtrArray *argbuf;
}
}
- new_item = folder_item_new(new_name, dirpath);
+ new_item = folder_item_new(folder, new_name, dirpath);
folder_item_append(parent, new_item);
g_free(imap_path);
g_free(dirpath);
gchar *old_cache_dir;
gchar *new_cache_dir;
IMAPSession *session;
- IMAPNameSpace *namespace;
+ gchar separator;
gint ok;
gint exists, recent, unseen;
guint32 uid_validity;
return -1;
}
- namespace = imap_find_namespace(IMAP_FOLDER(folder), item->path);
+ separator = imap_get_path_separator(IMAP_FOLDER(folder), item->path);
if (strchr(item->path, G_DIR_SEPARATOR)) {
dirpath = g_dirname(item->path);
newpath = g_strconcat(dirpath, G_DIR_SEPARATOR_S, name, NULL);
newpath = g_strdup(name);
real_newpath = imap_locale_to_modified_utf7(newpath);
- if (namespace && namespace->separator)
- imap_path_separator_subst(real_newpath, namespace->separator);
+ imap_path_separator_subst(real_newpath, separator);
ok = imap_cmd_rename(SESSION(session)->sock, real_oldpath, real_newpath);
statusbar_pop_all();
g_free(tmp);
continue;
}
- /* log_print("IMAP4< %s\n", tmp); */
- debug_print("IMAP4< %s\n", tmp);
+ log_print("IMAP4< %s\n", tmp);
g_string_assign(str, tmp);
g_free(tmp);
- msginfo = imap_parse_envelope(SESSION(session)->sock, str);
+ msginfo = imap_parse_envelope
+ (SESSION(session)->sock, item, str);
if (!msginfo) {
log_warning(_("can't parse envelope: %s\n"), str->str);
continue;
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 %d - %d ... "),
+ debug_print(_("Deleting cached messages %u - %u ... "),
first_uid, last_uid);
dir = folder_item_get_path(item);
debug_print(_("done.\n"));
}
-
+#if USE_SSL
+static SockInfo *imap_open_tunnel(const gchar *server,
+ const gchar *tunnelcmd,
+ SSLType ssl_type)
+#else
static SockInfo *imap_open_tunnel(const gchar *server,
const gchar *tunnelcmd)
+#endif
{
SockInfo *sock;
log_warning(_("Can't establish IMAP4 session with: %s\n"),
server);
return NULL;
-
+#if USE_SSL
+ return imap_init_sock(sock, ssl_type);
+#else
return imap_init_sock(sock);
+#endif
}
#if USE_SSL
static SockInfo *imap_open(const gchar *server, gushort port,
- gboolean use_ssl)
+ SSLType ssl_type)
#else
static SockInfo *imap_open(const gchar *server, gushort port)
#endif
}
#if USE_SSL
- if (use_ssl && !ssl_init_socket(sock)) {
+ if (ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
log_warning(_("Can't establish IMAP4 session with: %s:%d\n"),
server, port);
sock_close(sock);
return NULL;
}
-#endif
-
+ return imap_init_sock(sock, ssl_type);
+#else
return imap_init_sock(sock);
+#endif
}
-
+#if USE_SSL
+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 (ssl_type == SSL_STARTTLS) {
+ gint ok;
+
+ ok = imap_cmd_starttls(sock);
+ if (ok != IMAP_SUCCESS) {
+ log_warning(_("Can't start TLS session.\n"));
+ sock_close(sock);
+ return NULL;
+ }
+ if (!ssl_init_socket_with_method(sock, SSL_METHOD_TLSv1)) {
+ sock_close(sock);
+ return NULL;
+ }
+ }
+#endif
if (imap_cmd_noop(sock) != IMAP_SUCCESS) {
- log_warning(_("Can't establish IMAP4 session\n"));
+ log_warning(_("Can't establish IMAP4 session.\n"));
sock_close(sock);
return NULL;
}
const gchar *path)
{
IMAPNameSpace *namespace = NULL;
- gchar *name;
+ gchar *tmp_path, *name;
- g_return_val_if_fail(path != NULL, NULL);
+ if (!path) path = "";
+
+ Xstrcat_a(tmp_path, path, "/", return NULL);
for (; ns_list != NULL; ns_list = ns_list->next) {
IMAPNameSpace *tmp_ns = ns_list->data;
Xstrdup_a(name, tmp_ns->name, return namespace);
if (tmp_ns->separator && tmp_ns->separator != '/')
subst_char(name, tmp_ns->separator, '/');
- if (strncmp(path, name, strlen(name)) == 0)
+ if (strncmp(tmp_path, name, strlen(name)) == 0)
namespace = tmp_ns;
}
{
IMAPNameSpace *namespace;
+ g_return_val_if_fail(folder != NULL, NULL);
+
namespace = imap_find_namespace_from_list(folder->ns_personal, path);
if (namespace) return namespace;
namespace = imap_find_namespace_from_list(folder->ns_others, path);
return NULL;
}
+static gchar imap_get_path_separator(IMAPFolder *folder, const gchar *path)
+{
+ IMAPNameSpace *namespace;
+ gchar separator = '/';
+
+ namespace = imap_find_namespace(folder, path);
+ if (namespace && namespace->separator)
+ separator = namespace->separator;
+
+ return separator;
+}
+
static gchar *imap_get_real_path(IMAPFolder *folder, const gchar *path)
{
gchar *real_path;
- IMAPNameSpace *namespace;
+ gchar separator;
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(path != NULL, NULL);
real_path = imap_locale_to_modified_utf7(path);
- namespace = imap_find_namespace(folder, path);
- if (namespace && namespace->separator)
- imap_path_separator_subst(real_path, namespace->separator);
+ separator = imap_get_path_separator(folder, path);
+ imap_path_separator_subst(real_path, separator);
return real_path;
}
return cur_pos;
}
-static gchar *imap_parse_one_address(SockInfo *sock, gchar *start,
- gchar *out_from_str,
- gchar *out_fromname_str,
- GString *str)
+static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
+ GString *str)
{
- gchar buf[IMAPBUFSIZE];
- gchar *userid;
- gchar *domain;
- gchar *cur_pos = start;
-
- cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
- conv_unmime_header(out_fromname_str, IMAPBUFSIZE, buf, NULL);
-
- cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
+ gchar *nextline;
+ gchar buf[32];
+ gint len;
+ gint block_len = 0;
- cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
- Xstrdup_a(userid, buf, return cur_pos + 1);
+ *headers = NULL;
- cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
- Xstrdup_a(domain, buf, return cur_pos + 1);
+ g_return_val_if_fail(str != NULL, cur_pos);
- if (out_fromname_str[0] != '\0') {
- g_snprintf(out_from_str, IMAPBUFSIZE, "\"%s\" <%s@%s>",
- out_fromname_str, userid, domain);
- } else {
- g_snprintf(out_from_str, IMAPBUFSIZE, "%s@%s",
- userid, domain);
- strcpy(out_fromname_str, out_from_str);
- }
+ while (isspace(*cur_pos)) cur_pos++;
- while (*cur_pos == ' ') cur_pos++;
- g_return_val_if_fail(*cur_pos == ')', NULL);
+ g_return_val_if_fail(*cur_pos == '{', cur_pos);
- return cur_pos + 1;
-}
+ cur_pos = strchr_cpy(cur_pos + 1, '}', buf, sizeof(buf));
+ len = atoi(buf);
-static gchar *imap_parse_address(SockInfo *sock, gchar *start,
- gchar **out_from_str,
- gchar **out_fromname_str,
- GString *str)
-{
- gchar buf[IMAPBUFSIZE];
- gchar name_buf[IMAPBUFSIZE];
- gchar *cur_pos = start;
- GString *addr_str;
+ g_string_truncate(str, 0);
+ cur_pos = str->str;
- if (out_from_str) *out_from_str = NULL;
- if (out_fromname_str) *out_fromname_str = NULL;
- buf[0] = name_buf[0] = '\0';
+ do {
+ if ((nextline = sock_getline(sock)) == NULL)
+ return cur_pos;
+ block_len += strlen(nextline);
+ g_string_append(str, nextline);
+ cur_pos = str->str;
+ strretchomp(nextline);
+ /* debug_print("IMAP4< %s\n", nextline); */
+ g_free(nextline);
+ } while (block_len < len);
- if (!strncmp(cur_pos, "NIL", 3)) {
- if (out_from_str) *out_from_str = g_strdup("");
- if (out_fromname_str) *out_fromname_str = g_strdup("");
- return cur_pos + 3;
- }
+ debug_print("IMAP4< [contents of RFC822.HEADER]\n");
- g_return_val_if_fail(*cur_pos == '(', NULL);
- cur_pos++;
+ *headers = g_strndup(cur_pos, len);
+ cur_pos += len;
- addr_str = g_string_new(NULL);
+ while (isspace(*cur_pos)) cur_pos++;
+ while (*cur_pos == '\0') {
+ if ((nextline = sock_getline(sock)) == NULL)
+ return cur_pos;
+ g_string_assign(str, nextline);
+ cur_pos = str->str;
+ strretchomp(nextline);
+ debug_print("IMAP4< %s\n", nextline);
+ g_free(nextline);
- for (;;) {
- gchar ch = *cur_pos++;
- if (ch == ')') break;
- if (ch == '(') {
- cur_pos = imap_parse_one_address
- (sock, cur_pos, buf, name_buf, str);
- if (!cur_pos) {
- g_string_free(addr_str, TRUE);
- return NULL;
- }
- if (addr_str->str[0] != '\0')
- g_string_append(addr_str, ", ");
- g_string_append(addr_str, buf);
- }
+ while (isspace(*cur_pos)) cur_pos++;
}
- if (out_from_str) *out_from_str = g_strdup(addr_str->str);
- if (out_fromname_str) *out_fromname_str = g_strdup(name_buf);
-
- g_string_free(addr_str, TRUE);
-
return cur_pos;
}
static MsgFlags imap_parse_flags(const gchar *flag_str)
{
const gchar *p = flag_str;
- MsgFlags flags;
+ MsgFlags flags = {0, 0};
flags.perm_flags = MSG_UNREAD;
- flags.tmp_flags = MSG_IMAP;
while ((p = strchr(p, '\\')) != NULL) {
p++;
return flags;
}
-static MsgInfo *imap_parse_envelope(SockInfo *sock, GString *line_str)
+static MsgInfo *imap_parse_envelope(SockInfo *sock, FolderItem *item,
+ GString *line_str)
{
- MsgInfo *msginfo;
gchar buf[IMAPBUFSIZE];
- gchar tmp[IMAPBUFSIZE];
+ MsgInfo *msginfo = NULL;
gchar *cur_pos;
gint msgnum;
guint32 uid = 0;
size_t size = 0;
- gchar *date = NULL;
- time_t date_t = 0;
- gchar *subject = NULL;
- gchar *tmp_from;
- gchar *tmp_fromname;
- gchar *from = NULL;
- gchar *fromname = NULL;
- gchar *tmp_to;
- gchar *to = NULL;
- gchar *inreplyto = NULL;
- gchar *msgid = NULL;
- MsgFlags flags = {0, 0};
+ MsgFlags flags = {0, 0}, imap_flags = {0, 0};
g_return_val_if_fail(line_str != NULL, NULL);
g_return_val_if_fail(line_str->str[0] == '*' &&
line_str->str[1] == ' ', NULL);
+ MSG_SET_TMP_FLAGS(flags, MSG_IMAP);
+ if (item->stype == F_QUEUE) {
+ MSG_SET_TMP_FLAGS(flags, MSG_QUEUED);
+ } else if (item->stype == F_DRAFT) {
+ MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
+ }
+
cur_pos = line_str->str + 2;
-#define PARSE_ONE_ELEMENT(ch) \
-{ \
- cur_pos = strchr_cpy(cur_pos, ch, buf, sizeof(buf)); \
- g_return_val_if_fail(cur_pos != NULL, NULL); \
+#define PARSE_ONE_ELEMENT(ch) \
+{ \
+ cur_pos = strchr_cpy(cur_pos, ch, buf, sizeof(buf)); \
+ if (cur_pos == NULL) { \
+ g_warning("cur_pos == NULL\n"); \
+ procmsg_msginfo_free(msginfo); \
+ return NULL; \
+ } \
}
PARSE_ONE_ELEMENT(' ');
uid = strtoul(cur_pos, &cur_pos, 10);
} else if (!strncmp(cur_pos, "FLAGS ", 6)) {
cur_pos += 6;
- g_return_val_if_fail(*cur_pos == '(', NULL);
+ if (*cur_pos != '(') {
+ g_warning("*cur_pos != '('\n");
+ procmsg_msginfo_free(msginfo);
+ return NULL;
+ }
cur_pos++;
PARSE_ONE_ELEMENT(')');
- flags = imap_parse_flags(buf);
+ imap_flags = imap_parse_flags(buf);
} else if (!strncmp(cur_pos, "RFC822.SIZE ", 12)) {
cur_pos += 12;
size = strtol(cur_pos, &cur_pos, 10);
- } else if (!strncmp(cur_pos, "ENVELOPE ", 9)) {
- cur_pos += 9;
- g_return_val_if_fail(*cur_pos == '(', NULL);
- cur_pos = imap_parse_atom
- (sock, cur_pos + 1, buf, sizeof(buf), line_str);
- if (buf[0] != '\0') {
- Xstrdup_a(date, buf, return NULL);
- date_t = procheader_date_parse(NULL, date, 0);
- }
-
- cur_pos = imap_parse_atom
- (sock, cur_pos, buf, sizeof(buf), line_str);
- if (buf[0] != '\0') {
- conv_unmime_header(tmp, sizeof(tmp), buf, NULL);
- Xstrdup_a(subject, tmp, return NULL);
- }
-
- g_return_val_if_fail(*cur_pos == ' ', NULL);
- cur_pos = imap_parse_address(sock, cur_pos + 1,
- &tmp_from, &tmp_fromname,
- line_str);
- g_return_val_if_fail(cur_pos != NULL, NULL);
- if (tmp_from && *tmp_from != '\0')
- Xstrdup_a(from, tmp_from,
- {g_free(tmp_from);
- g_free(tmp_fromname);
- return NULL;});
- if (tmp_fromname && *tmp_fromname != '\0')
- Xstrdup_a(fromname, tmp_fromname,
- {g_free(tmp_from);
- g_free(tmp_fromname);
- return NULL;});
- g_free(tmp_from);
- g_free(tmp_fromname);
-
-#define SKIP_ONE_ELEMENT() \
-{ \
- g_return_val_if_fail(*cur_pos == ' ', NULL); \
- cur_pos = imap_parse_address(sock, cur_pos + 1, NULL, NULL, \
- line_str); \
- g_return_val_if_fail(cur_pos != NULL, NULL); \
-}
-
- /* skip sender and reply-to */
- SKIP_ONE_ELEMENT();
- SKIP_ONE_ELEMENT();
-
- g_return_val_if_fail(*cur_pos == ' ', NULL);
- cur_pos = imap_parse_address(sock, cur_pos + 1,
- &tmp_to, NULL, line_str);
- g_return_val_if_fail(cur_pos != NULL, NULL);
- Xstrdup_a(to, tmp_to, {g_free(tmp_to); return NULL;});
- g_free(tmp_to);
-
- /* skip Cc and Bcc */
- SKIP_ONE_ELEMENT();
- SKIP_ONE_ELEMENT();
-
-#undef SKIP_ONE_ELEMENT
-
- g_return_val_if_fail(*cur_pos == ' ', NULL);
- cur_pos = imap_parse_atom
- (sock, cur_pos, buf, sizeof(buf), line_str);
- g_return_val_if_fail(cur_pos != NULL, NULL);
- if (buf[0] != '\0') {
- eliminate_parenthesis(buf, '(', ')');
- extract_parenthesis(buf, '<', '>');
- remove_space(buf);
- Xstrdup_a(inreplyto, buf, return NULL);
- }
-
- g_return_val_if_fail(*cur_pos == ' ', NULL);
- cur_pos = imap_parse_atom
- (sock, cur_pos, buf, sizeof(buf), line_str);
- g_return_val_if_fail(cur_pos != NULL, NULL);
- if (buf[0] != '\0') {
- extract_parenthesis(buf, '<', '>');
- remove_space(buf);
- Xstrdup_a(msgid, buf, return NULL);
- }
-
- g_return_val_if_fail(*cur_pos == ')', NULL);
- cur_pos++;
+ } else if (!strncmp(cur_pos, "RFC822.HEADER ", 14)) {
+ gchar *headers;
+
+ cur_pos += 14;
+ cur_pos = imap_get_header(sock, cur_pos, &headers,
+ line_str);
+ msginfo = procheader_parse_str(headers, flags, FALSE, FALSE);
+ g_free(headers);
} else {
g_warning("invalid FETCH response: %s\n", cur_pos);
break;
}
}
- msginfo = g_new0(MsgInfo, 1);
- msginfo->msgnum = uid;
- msginfo->size = size;
- msginfo->date = g_strdup(date);
- msginfo->date_t = date_t;
- msginfo->subject = g_strdup(subject);
- msginfo->from = g_strdup(from);
- msginfo->fromname = g_strdup(fromname);
- msginfo->to = g_strdup(to);
- msginfo->inreplyto = g_strdup(inreplyto);
- msginfo->msgid = g_strdup(msgid);
- msginfo->flags = flags;
+ if (msginfo) {
+ msginfo->msgnum = uid;
+ msginfo->size = size;
+ msginfo->flags.tmp_flags |= imap_flags.tmp_flags;
+ msginfo->flags.perm_flags = imap_flags.perm_flags;
+ }
return msginfo;
}
return imap_cmd_ok(sock, NULL);
}
+static gint imap_cmd_starttls(SockInfo *sock)
+{
+ imap_cmd_gen_send(sock, "STARTTLS");
+ return imap_cmd_ok(sock, NULL);
+}
+
#define THROW(err) { ok = err; goto catch; }
static gint imap_cmd_namespace(SockInfo *sock, gchar **ns_str)
gint imap_cmd_envelope(SockInfo *sock, guint32 first_uid, guint32 last_uid)
{
imap_cmd_gen_send
- (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE ENVELOPE)",
+ (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE RFC822.HEADER)",
first_uid, last_uid);
return IMAP_SUCCESS;
return FALSE;
}
+
+GSList *imap_get_num_list(Folder *folder, FolderItem *_item)
+{
+ IMAPFolderItem *item = (IMAPFolderItem *)_item;
+ IMAPSession *session;
+ GSList *msgnum_list = NULL;
+ gint i, lastuid_old;
+ gint ok, exists = 0, recent = 0, unseen = 0;
+ guint32 uid_validity = 0;
+ GPtrArray *argbuf;
+ gchar *cmdbuf = NULL;
+
+ g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(item != NULL, NULL);
+ g_return_val_if_fail(item->item.path != 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);
+ g_return_val_if_fail(session != NULL, NULL);
+
+ ok = imap_select(session, IMAP_FOLDER(folder), item->item.path,
+ &exists, &recent, &unseen, &uid_validity);
+ if (ok != IMAP_SUCCESS)
+ return NULL;
+
+ if(item->item.mtime != uid_validity) {
+ item->lastuid = 0;
+ g_slist_free(item->uid_list);
+ item->uid_list = NULL;
+
+ item->item.mtime = uid_validity;
+ }
+
+ 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)");
+ }
+ imap_cmd_gen_send(SESSION(session)->sock, cmdbuf);
+ g_free(cmdbuf);
+ ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
+ if (ok != IMAP_SUCCESS) {
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+ return NULL;
+ }
+
+ lastuid_old = item->lastuid;
+ msgnum_list = g_slist_copy(item->uid_list);
+ debug_print("Got %d uids from cache\n", g_slist_length(msgnum_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));
+
+ if(msgnum > item->lastuid)
+ item->lastuid = msgnum;
+ }
+ }
+ }
+
+ return msgnum_list;
+}
+
+MsgInfo *imap_fetch_msginfo(Folder *folder, FolderItem *item, gint num)
+{
+ gchar *tmp;
+ IMAPSession *session;
+ GString *str;
+ MsgInfo *msginfo;
+ gint ok, exists = 0, recent = 0, unseen = 0;
+ guint32 uid_validity = 0;
+
+ g_return_val_if_fail(folder != 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);
+
+ session = imap_session_get(folder);
+ g_return_val_if_fail(session != NULL, NULL);
+
+ ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+ &exists, &recent, &unseen, &uid_validity);
+ if (ok != IMAP_SUCCESS)
+ return NULL;
+
+ if (imap_cmd_envelope(SESSION(session)->sock, num, num)
+ != IMAP_SUCCESS) {
+ log_warning(_("can't get envelope\n"));
+ return NULL;
+ }
+
+ str = g_string_new(NULL);
+
+ if ((tmp = sock_getline(SESSION(session)->sock)) == NULL) {
+ log_warning(_("error occurred while getting envelope.\n"));
+ g_string_free(str, TRUE);
+ return NULL;
+ }
+ strretchomp(tmp);
+ log_print("IMAP4< %s\n", tmp);
+ g_string_assign(str, tmp);
+ g_free(tmp);
+
+ msginfo = imap_parse_envelope(SESSION(session)->sock, item, str);
+ if (!msginfo) {
+ log_warning(_("can't parse envelope: %s\n"), str->str);
+ }
+
+ tmp = NULL;
+ do {
+ g_free(tmp);
+ tmp = sock_getline(SESSION(session)->sock);
+ } while (!(tmp == NULL || tmp[0] != '*' || tmp[1] != ' '));
+
+ msginfo->folder = item;
+
+ g_string_free(str, TRUE);
+
+ return msginfo;
+}
+
+gboolean imap_check_msgnum_validity(Folder *folder, FolderItem *_item)
+{
+ IMAPSession *session;
+ IMAPFolderItem *item = (IMAPFolderItem *)_item;
+ gint ok, exists = 0, recent = 0, unseen = 0;
+ guint32 uid_next, uid_validity = 0;
+
+ 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);
+
+ session = imap_session_get(folder);
+ g_return_val_if_fail(session != NULL, FALSE);
+
+ ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
+ &exists, &recent, &uid_next, &uid_validity, &unseen);
+ if (ok != IMAP_SUCCESS)
+ return FALSE;
+
+ return item->item.mtime == uid_validity;
+}
projects / claws.git / blobdiff