/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <unistd.h>
#include <ctype.h>
#include <time.h>
-#if HAVE_LIBJCONV
-# include <jconv.h>
+#if HAVE_ICONV
+# include <iconv.h>
#endif
#include "intl.h"
#include "procmsg.h"
#include "procheader.h"
#include "folder.h"
-#include "statusbar.h"
#include "prefs_account.h"
#include "codeconv.h"
#include "utils.h"
#include "log.h"
#define IMAP4_PORT 143
-#if USE_SSL
+#if USE_OPENSSL
#define IMAPS_PORT 993
#endif
FolderItem *item);
static GSList *imap_parse_list (Folder *folder,
IMAPSession *session,
- const gchar *real_path);
+ const gchar *real_path,
+ gchar *separator);
static void imap_create_missing_folders (Folder *folder);
static FolderItem *imap_create_special_folder
FolderItem *dest,
MsgInfo *msginfo,
gboolean remove_source);
+#if 0
static gint imap_do_copy_msgs_with_dest (Folder *folder,
FolderItem *dest,
GSList *msglist,
gboolean remove_source);
+#endif
static GSList *imap_get_uncached_messages (IMAPSession *session,
FolderItem *item,
guint32 last_uid);
static void imap_delete_all_cached_messages (FolderItem *item);
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open (const gchar *server,
gushort port,
SSLType ssl_type);
gushort port);
#endif
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open_tunnel(const gchar *server,
const gchar *tunnelcmd,
SSLType ssl_type);
const gchar *tunnelcmd);
#endif
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type);
#else
static SockInfo *imap_init_sock(SockInfo *sock);
static void imap_parse_namespace (IMAPSession *session,
IMAPFolder *folder);
+static void imap_get_namespace_by_list (IMAPSession *session,
+ IMAPFolder *folder);
static IMAPNameSpace *imap_find_namespace (IMAPFolder *folder,
const gchar *path);
static gchar imap_get_path_separator (IMAPFolder *folder,
static MsgInfo *imap_parse_envelope (SockInfo *sock,
FolderItem *item,
GString *line_str);
-static gint imap_greeting (SockInfo *sock,
- gboolean *is_preauth);
+static gint imap_greeting (SockInfo *sock,
+ gboolean *is_preauth);
+static void imap_get_capability (Session *session);
+static gboolean imap_has_capability (IMAPSession *session,
+ const gchar *cap);
/* low-level IMAP4rev1 commands */
static gint imap_cmd_login (SockInfo *sock,
static gint imap_cmd_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,
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);
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;
-
- ((IMAPFolder *)folder)->selected_folder = NULL;
}
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);
g_return_val_if_fail(folder->type == F_IMAP, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
-#if USE_SSL
+#if USE_OPENSSL
port = folder->account->set_imapport ? folder->account->imapport
: folder->account->ssl_imap == SSL_TUNNEL
? IMAPS_PORT : IMAP4_PORT;
: IMAP4_PORT;
#endif
- if (!rfolder->session) {
- rfolder->session =
- imap_session_new(folder->account);
- if (rfolder->session) {
- imap_parse_namespace(IMAP_SESSION(rfolder->session),
- IMAP_FOLDER(folder));
- rfolder->session->last_access_time = time(NULL);
- g_free(((IMAPFolder *)folder)->selected_folder);
- ((IMAPFolder *)folder)->selected_folder = NULL;
- imap_reset_uid_lists(folder);
- }
- statusbar_pop_all();
- return IMAP_SESSION(rfolder->session);
+ /* Make sure we have a session */
+ if (rfolder->session != NULL) {
+ session = rfolder->session;
+ } else {
+ imap_reset_uid_lists(folder);
+ session = imap_session_new(folder->account);
}
+ if(session == NULL)
+ return NULL;
+
+ /* Get CAPABILITY */
+ imap_get_capability(session);
+
+ /* Make sure session is authenticated */
+ if (!IMAP_SESSION(session)->authenticated)
+ imap_session_authenticate(IMAP_SESSION(session), folder->account);
+ if (!IMAP_SESSION(session)->authenticated) {
+ session_destroy(session);
+ rfolder->session = NULL;
+ return NULL;
+ }
+
+ /* Make sure we have parsed the IMAP namespace */
+ imap_parse_namespace(IMAP_SESSION(session),
+ IMAP_FOLDER(folder));
/* I think the point of this code is to avoid sending a
* keepalive if we've used the session recently and therefore
* A better solution than sending a NOOP every time would be
* for every command to be prepared to retry until it is
* successfully sent. -- mbp */
- if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
- rfolder->session->last_access_time = time(NULL);
- statusbar_pop_all();
- return IMAP_SESSION(rfolder->session);
- }
-
- if (imap_cmd_noop(rfolder->session->sock) != IMAP_SUCCESS) {
- log_warning(_("IMAP4 connection to %s:%d has been"
- " disconnected. Reconnecting...\n"),
- folder->account->recv_server, port);
- session_destroy(rfolder->session);
- rfolder->session =
- imap_session_new(folder->account);
- if (rfolder->session) {
- imap_parse_namespace(IMAP_SESSION(rfolder->session),
- IMAP_FOLDER(folder));
- g_free(((IMAPFolder *)folder)->selected_folder);
- ((IMAPFolder *)folder)->selected_folder = 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 {
+ log_warning(_("IMAP4 connection to %s:%d has been"
+ " disconnected. Reconnecting...\n"),
+ folder->account->recv_server, port);
+ session_destroy(session);
+ /* Clear folders session to make imap_session_get create
+ a new session, because of rfolder->session == NULL
+ it will not try to reconnect again and so avoid an
+ endless loop */
+ rfolder->session = NULL;
+ session = SESSION(imap_session_get(folder));
+ }
}
}
- if (rfolder->session)
- rfolder->session->last_access_time = time(NULL);
- statusbar_pop_all();
- return IMAP_SESSION(rfolder->session);
+ rfolder->session = session;
+ if (session) {
+ session->last_access_time = time(NULL);
+ }
+ return IMAP_SESSION(session);
}
Session *imap_session_new(const PrefsAccount *account)
IMAPSession *session;
SockInfo *imap_sock;
gushort port;
- gchar *pass;
gboolean is_preauth;
-#ifdef USE_SSL
+#ifdef USE_OPENSSL
/* FIXME: IMAP over SSL only... */
SSLType ssl_type;
if (account->set_tunnelcmd) {
log_message(_("creating tunneled IMAP4 connection\n"));
-#if USE_SSL
+#if USE_OPENSSL
if ((imap_sock = imap_open_tunnel(account->recv_server,
account->tunnelcmd,
ssl_type)) == NULL)
log_message(_("creating IMAP4 connection to %s:%d ...\n"),
account->recv_server, port);
-#if USE_SSL
+#if USE_OPENSSL
if ((imap_sock = imap_open(account->recv_server, port,
ssl_type)) == NULL)
#else
}
/* Only need to log in if the connection was not PREAUTH */
- imap_greeting(imap_sock, &is_preauth);
+ if (imap_greeting(imap_sock, &is_preauth) != IMAP_SUCCESS) {
+ sock_close(imap_sock);
+ return NULL;
+ }
log_message("IMAP connection is %s-authenticated\n",
(is_preauth) ? "pre" : "un");
- if (!is_preauth) {
- g_return_val_if_fail(account->userid != NULL, NULL);
-
- pass = account->passwd;
- if (!pass) {
- gchar *tmp_pass;
- tmp_pass = input_dialog_query_password(account->recv_server, account->userid);
- if (!tmp_pass)
- return NULL;
- Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return NULL;});
- g_free(tmp_pass);
- }
-
- if (imap_cmd_login(imap_sock, account->userid, pass) != IMAP_SUCCESS) {
- imap_cmd_logout(imap_sock);
- sock_close(imap_sock);
- return NULL;
- }
- }
session = g_new(IMAPSession, 1);
-
SESSION(session)->type = SESSION_IMAP;
SESSION(session)->server = g_strdup(account->recv_server);
SESSION(session)->sock = imap_sock;
SESSION(session)->destroy = imap_session_destroy;
+ session->capability = NULL;
+
session->mbox = NULL;
+ session->authenticated = is_preauth;
session_list = g_list_append(session_list, session);
return SESSION(session);
}
+void imap_session_authenticate(IMAPSession *session, const PrefsAccount *account)
+{
+ gchar *pass;
+
+ g_return_if_fail(account->userid != NULL);
+
+ pass = account->passwd;
+ if (!pass) {
+ gchar *tmp_pass;
+ tmp_pass = input_dialog_query_password(account->recv_server, account->userid);
+ if (!tmp_pass)
+ return;
+ Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return;});
+ g_free(tmp_pass);
+ }
+
+ if (imap_cmd_login(SESSION(session)->sock, account->userid, pass) != IMAP_SUCCESS) {
+ imap_cmd_logout(SESSION(session)->sock);
+ return;
+ }
+
+ session->authenticated = TRUE;
+}
+
void imap_session_destroy(Session *session)
{
sock_close(session->sock);
g_free(IMAP_SESSION(session)->mbox);
+ g_strfreev(IMAP_SESSION(session)->capability);
+
session_list = g_list_remove(session_list, session);
}
mlist = procmsg_read_cache(item, FALSE);
item->last_num = procmsg_get_last_num_in_msg_list(mlist);
procmsg_set_flags(mlist, item);
- statusbar_pop_all();
return mlist;
}
last_uid = first_uid;
} else {
imap_delete_all_cached_messages(item);
- statusbar_pop_all();
return NULL;
}
item->last_num = last_uid;
catch:
- statusbar_pop_all();
return mlist;
}
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't select mailbox %s\n"), item->path);
+ g_warning("can't select mailbox %s\n", item->path);
g_free(filename);
return NULL;
}
debug_print("getting message %d...\n", uid);
ok = imap_cmd_fetch(SESSION(session)->sock, (guint32)uid, filename);
- statusbar_pop_all();
-
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't fetch message %d\n"), uid);
+ g_warning("can't fetch message %d\n", uid);
g_free(filename);
return NULL;
}
ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
&messages, &recent, &uid_next, &uid_validity, &unseen);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't append message %s\n"), file);
+ g_warning("can't append message %s\n", file);
return -1;
}
g_free(destdir);
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't append message %s\n"), file);
+ g_warning("can't append message %s\n", file);
return -1;
}
{
gchar *destdir;
IMAPSession *session;
- gint messages, recent, unseen, exists;
- guint32 uid_next, uid_validity;
+ IMAPFlags iflags = 0;
+ gint messages, recent, unseen;
+ guint32 newuid = 0, uid_validity;
gint ok;
g_return_val_if_fail(folder != NULL, -1);
if (!session) return -1;
if (msginfo->folder == dest) {
- g_warning(_("the src folder is identical to the dest.\n"));
+ g_warning("the src folder is identical to the dest.\n");
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;
+ /* 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 */
- if (strcmp(((IMAPFolder *)folder)->selected_folder,
- msginfo->folder->path) != 0) {
- ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
- &exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
- if (ok != IMAP_SUCCESS)
- return -1;
- }
+ /* 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)
+ if (remove_source)
debug_print("Moving message %s%c%d to %s ...\n",
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, destdir);
msginfo->folder->path, G_DIR_SEPARATOR,
msginfo->msgnum, destdir);
- ok = imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum, destdir);
+ ok = imap_cmd_copy(session, msginfo->msgnum, destdir, &newuid);
if (ok == IMAP_SUCCESS && remove_source) {
imap_set_message_flags(session, msginfo->msgnum, msginfo->msgnum,
ok = imap_cmd_expunge(SESSION(session)->sock);
}
+ /* get the dest folder to set the flags */
+ if (newuid) {
+ ok = imap_select(session, IMAP_FOLDER(folder), dest->path,
+ NULL, NULL, NULL, NULL);
+ if (ok != IMAP_SUCCESS) /* the folder disappeared? */
+ return -1;
+
+ if (msginfo->flags.perm_flags & MSG_MARKED) iflags |= IMAP_FLAG_FLAGGED;
+ if (msginfo->flags.perm_flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
+ if (iflags)
+ if (imap_set_message_flags(session, newuid, newuid, iflags, TRUE)
+ != IMAP_SUCCESS)
+ newuid = 0;
+ }
+
g_free(destdir);
- statusbar_pop_all();
if (ok == IMAP_SUCCESS)
- return uid_next;
+ return newuid;
else
return -1;
}
+#if 0
static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
GSList *msglist,
gboolean remove_source)
MsgInfo *msginfo;
IMAPSession *session;
gint ok = IMAP_SUCCESS;
- gint exists, recent, unseen;
- guint32 uid_validity;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
msginfo = (MsgInfo *)cur->data;
if (msginfo->folder == dest) {
- g_warning(_("the src folder is identical to the dest.\n"));
+ g_warning("the src folder is identical to the dest.\n");
continue;
}
- /* ensure source folder selected */
- if (strcmp(((IMAPFolder *)folder)->selected_folder,
- msginfo->folder->path) != 0) {
- ok = imap_select(session, IMAP_FOLDER(folder),
- msginfo->folder->path, &exists, &recent, &unseen,
- &uid_validity);
- statusbar_pop_all();
- if (ok != IMAP_SUCCESS)
- return -1;
- }
+ /* 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);
- ok = imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum,
- destdir);
+ ok = imap_cmd_copy(session, msginfo, destdir);
if (ok == IMAP_SUCCESS && remove_source) {
imap_set_message_flags
ok = imap_cmd_expunge(SESSION(session)->sock);
g_free(destdir);
- statusbar_pop_all();
if (ok == IMAP_SUCCESS)
return 0;
else
return -1;
}
+#endif
gint imap_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
return ret;
}
+#if 0
gint imap_move_msgs_with_dest(Folder *folder, FolderItem *dest,
GSList *msglist)
{
return ret;
}
+#endif
gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
return ret;
}
+#if 0
gint imap_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
GSList *msglist)
{
return ret;
}
+#endif
gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
{
- gint exists, recent, unseen;
- guint32 uid_validity;
gint ok;
IMAPSession *session;
gchar *dir;
if (!session) return -1;
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
- &exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
+ NULL, NULL, NULL, NULL);
if (ok != IMAP_SUCCESS)
return ok;
ok = imap_set_message_flags
(IMAP_SESSION(REMOTE_FOLDER(folder)->session),
(guint32)uid, (guint32)uid, IMAP_FLAG_DELETED, TRUE);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: %d\n"), uid);
return ok;
}
ok = imap_cmd_expunge(SESSION(session)->sock);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't expunge\n"));
return ok;
gint imap_remove_msgs(Folder *folder, FolderItem *item, GSList *msglist)
{
- gint exists, recent, unseen;
- guint32 uid_validity;
gint ok;
IMAPSession *session;
gchar *dir;
if (!session) return -1;
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
- &exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
+ NULL, NULL, NULL, NULL);
if (ok != IMAP_SUCCESS)
return ok;
ok = imap_set_message_flags
(IMAP_SESSION(REMOTE_FOLDER(folder)->session),
uid, uid, IMAP_FLAG_DELETED, TRUE);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: %d\n"), uid);
return ok;
}
ok = imap_cmd_expunge(SESSION(session)->sock);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't expunge\n"));
return ok;
gint imap_remove_all_msg(Folder *folder, FolderItem *item)
{
- gint exists, recent, unseen;
- guint32 uid_validity;
+ gint exists, recent, unseen;
+ guint32 uid_validity;
gint ok;
IMAPSession *session;
gchar *dir;
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
&exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS)
return ok;
if (exists == 0)
imap_cmd_gen_send(SESSION(session)->sock,
"STORE 1:%d +FLAGS (\\Deleted)", exists);
ok = imap_cmd_ok(SESSION(session)->sock, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: 1:%d\n"), exists);
return ok;
}
ok = imap_cmd_expunge(SESSION(session)->sock);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't expunge\n"));
return ok;
ok = imap_status(session, IMAP_FOLDER(folder), item->path,
&messages, &recent, &uid_next, &uid_validity, &unseen);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) return -1;
item->new = unseen > 0 ? recent : 0;
wildcard_path);
strtailchomp(real_path, separator);
- item_list = imap_parse_list(folder, session, real_path);
+ item_list = imap_parse_list(folder, session, real_path, NULL);
g_free(real_path);
for (cur = item_list; cur != NULL; cur = cur->next) {
return IMAP_SUCCESS;
}
-static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar *real_path)
+static GSList *imap_parse_list(Folder *folder, IMAPSession *session,
+ const gchar *real_path, gchar *separator)
{
gchar buf[IMAPBUFSIZE];
gchar flags[256];
- gchar separator[16];
+ gchar separator_str[16];
gchar *p;
gchar *name;
gchar *loc_name, *loc_path;
if (!p) continue;
while (*p == ' ') p++;
- p = strchr_cpy(p, ' ', separator, sizeof(separator));
+ p = strchr_cpy(p, ' ', separator_str, sizeof(separator_str));
if (!p) continue;
- extract_quote(separator, '"');
- if (!strcmp(separator, "NIL"))
- separator[0] = '\0';
+ extract_quote(separator_str, '"');
+ if (!strcmp(separator_str, "NIL"))
+ separator_str[0] = '\0';
+ if (separator)
+ *separator = separator_str[0];
buf[0] = '\0';
while (*p == ' ') p++;
buf, sizeof(buf), str);
else
strncpy2(buf, p, sizeof(buf));
- strtailchomp(buf, separator[0]);
+ strtailchomp(buf, separator_str[0]);
if (buf[0] == '\0') continue;
if (!strcmp(buf, real_path)) continue;
- if (separator[0] != '\0')
- subst_char(buf, separator[0], '/');
+ if (separator_str[0] != '\0')
+ subst_char(buf, separator_str[0], '/');
name = g_basename(buf);
if (name[0] == '.') continue;
}
g_string_free(str, TRUE);
- statusbar_pop_all();
return item_list;
}
new_item = imap_create_folder(folder, item, name);
if (!new_item) {
- g_warning(_("Can't create '%s'\n"), name);
+ g_warning("Can't create '%s'\n", name);
if (!folder->inbox) return NULL;
new_item = imap_create_folder(folder, folder->inbox, name);
if (!new_item)
- g_warning(_("Can't create '%s' under INBOX\n"), name);
+ g_warning("Can't create '%s' under INBOX\n", name);
else
new_item->stype = stype;
} else
argbuf = g_ptr_array_new();
ok = imap_cmd_list(SESSION(session)->sock, NULL, imap_path,
argbuf);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't create mailbox: LIST failed\n"));
g_free(imap_path);
g_free(dirpath);
+ ptr_array_free_strings(argbuf);
g_ptr_array_free(argbuf, TRUE);
return NULL;
}
break;
}
}
+ ptr_array_free_strings(argbuf);
g_ptr_array_free(argbuf, TRUE);
if (!exist) {
ok = imap_cmd_create(SESSION(session)->sock, imap_path);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't create mailbox\n"));
g_free(imap_path);
session->mbox = NULL;
ok = imap_cmd_examine(SESSION(session)->sock, "INBOX",
&exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
g_free(real_oldpath);
return -1;
imap_path_separator_subst(real_newpath, separator);
ok = imap_cmd_rename(SESSION(session)->sock, real_oldpath, real_newpath);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't rename mailbox: %s to %s\n"),
real_oldpath, real_newpath);
ok = imap_cmd_examine(SESSION(session)->sock, "INBOX",
&exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
g_free(path);
return -1;
}
ok = imap_cmd_delete(SESSION(session)->sock, path);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't delete mailbox\n"));
g_free(path);
debug_print("done.\n");
}
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open_tunnel(const gchar *server,
const gchar *tunnelcmd,
SSLType ssl_type)
log_warning(_("Can't establish IMAP4 session with: %s\n"),
server);
return NULL;
-#if USE_SSL
+#if USE_OPENSSL
return imap_init_sock(sock, ssl_type);
#else
return imap_init_sock(sock);
}
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open(const gchar *server, gushort port,
SSLType ssl_type)
#else
return NULL;
}
-#if USE_SSL
+#if USE_OPENSSL
if (ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
log_warning(_("Can't establish IMAP4 session with: %s:%d\n"),
server, port);
#endif
}
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type)
#else
static SockInfo *imap_init_sock(SockInfo *sock)
#endif
{
imap_cmd_count = 0;
-#if USE_SSL
+#if USE_OPENSSL
if (ssl_type == SSL_STARTTLS) {
gint ok;
folder->ns_shared != NULL)
return;
+ if (!imap_has_capability(session, "NAMESPACE")) {
+ imap_get_namespace_by_list(session, folder);
+ return;
+ }
+
if (imap_cmd_namespace(SESSION(session)->sock, &ns_str)
!= IMAP_SUCCESS) {
log_warning(_("can't get namespace\n"));
}
str_array = strsplit_parenthesis(ns_str, '(', ')', 3);
+ if (str_array == NULL) {
+ g_free(ns_str);
+ imap_get_namespace_by_list(session, folder);
+ return;
+ }
if (str_array[0])
folder->ns_personal = imap_parse_namespace_str(str_array[0]);
if (str_array[0] && str_array[1])
g_free(ns_str);
}
+static void imap_get_namespace_by_list(IMAPSession *session, IMAPFolder *folder)
+{
+ GSList *item_list, *cur;
+ gchar separator = '\0';
+ IMAPNameSpace *namespace;
+
+ g_return_if_fail(session != NULL);
+ g_return_if_fail(folder != NULL);
+
+ if (folder->ns_personal != NULL ||
+ folder->ns_others != NULL ||
+ folder->ns_shared != NULL)
+ return;
+
+ imap_cmd_gen_send(SESSION(session)->sock, "LIST \"\" \"\"");
+ item_list = imap_parse_list(NULL, session, "", &separator);
+ for (cur = item_list; cur != NULL; cur = cur->next)
+ folder_item_destroy(FOLDER_ITEM(cur->data));
+ g_slist_free(item_list);
+
+ namespace = g_new(IMAPNameSpace, 1);
+ namespace->name = g_strdup("");
+ namespace->separator = separator;
+ folder->ns_personal = g_list_append(NULL, namespace);
+}
+
static IMAPNameSpace *imap_find_namespace_from_list(GList *ns_list,
const gchar *path)
{
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);
session->mbox = g_strdup(path);
g_free(real_path);
- g_free(folder->selected_folder);
- folder->selected_folder = g_strdup(path);
-
return ok;
}
imap_cmd_gen_send(sock, "NOOP");
argbuf = g_ptr_array_new(); /* will hold messages sent back */
r = imap_cmd_ok(sock, argbuf);
- *is_preauth = search_array_starts(argbuf, "PREAUTH") != NULL;
+ *is_preauth = search_array_str(argbuf, "PREAUTH") != NULL;
+
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
return r;
}
+static void imap_get_capability(Session *session)
+{
+ gchar *capstr;
+ GPtrArray *argbuf;
+
+ if (IMAP_SESSION(session)->capability != NULL)
+ return;
+
+ imap_cmd_gen_send(session->sock, "CAPABILITY");
+
+ argbuf = g_ptr_array_new();
+
+ if (imap_cmd_ok(session->sock, argbuf) != IMAP_SUCCESS ||
+ ((capstr = search_array_str(argbuf, "CAPABILITY ")) == NULL)) {
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+ return;
+ }
+
+ capstr += strlen("CAPABILITY ");
+
+ IMAP_SESSION(session)->capability = g_strsplit(capstr, " ", 0);
+
+ ptr_array_free_strings(argbuf);
+ g_ptr_array_free(argbuf, TRUE);
+}
+
+static gboolean imap_has_capability(IMAPSession *session, const gchar *cap)
+{
+ gchar **p;
+
+ for (p = session->capability; *p != NULL; ++p)
+ if (g_strcasecmp(*p, cap) == 0)
+ return TRUE;
+
+ return FALSE;
+}
+
static gint imap_cmd_noop(SockInfo *sock)
{
imap_cmd_gen_send(sock, "NOOP");
return imap_cmd_ok(sock, NULL);
}
-static gint imap_cmd_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;
}
return (gchar *)(*p == ch ? p + 1 : p);
}
-static gchar *search_array_starts(GPtrArray *array, const gchar *str)
-{
- gint i;
- size_t len;
-
- g_return_val_if_fail(str != NULL, NULL);
- len = strlen(str);
- for (i = 0; i < array->len; i++) {
- gchar *tmp;
- tmp = g_ptr_array_index(array, i);
- if (strncmp(tmp, str, len) == 0)
- return tmp;
- }
- return NULL;
-}
-
-static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
+static gchar *search_array_contain_str(GPtrArray *array, const gchar *str)
{
gint i;
return NULL;
}
-static gchar *search_array_str(GPtrArray *array, gchar *str)
+static gchar *search_array_str(GPtrArray *array, const gchar *str)
{
gint i;
gint len;
static gchar *imap_modified_utf7_to_locale(const gchar *mutf7_str)
{
-#if !HAVE_LIBJCONV
+#if !HAVE_ICONV
return g_strdup(mutf7_str);
#else
static iconv_t cd = (iconv_t)-1;
if (cd == (iconv_t)-1) {
cd = iconv_open(conv_get_current_charset_str(), "UTF-7");
if (cd == (iconv_t)-1) {
- g_warning(_("iconv cannot convert UTF-7 to %s\n"),
+ g_warning("iconv cannot convert UTF-7 to %s\n",
conv_get_current_charset_str());
iconv_ok = FALSE;
return g_strdup(mutf7_str);
to_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"),
+ 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;
if (cd == (iconv_t)-1) {
cd = iconv_open("UTF-7", conv_get_current_charset_str());
if (cd == (iconv_t)-1) {
- g_warning(_("iconv cannot convert %s to UTF-7\n"),
+ g_warning("iconv cannot convert %s to UTF-7\n",
conv_get_current_charset_str());
iconv_ok = FALSE;
return g_strdup(from);
from_len -= mblen;
if (iconv(cd, &from_tmp, &mblen,
&norm_utf7_p, &norm_utf7_len) == -1) {
- g_warning(_("iconv cannot convert %s to UTF-7\n"),
+ g_warning("iconv cannot convert %s to UTF-7\n",
conv_get_current_charset_str());
return g_strdup(from);
}
g_string_free(to_str, FALSE);
return to;
-#endif
+#endif /* !HAVE_ICONV */
}
static gboolean imap_rename_folder_func(GNode *node, gpointer data)
{
IMAPFolderItem *item = (IMAPFolderItem *)_item;
IMAPSession *session;
- gint i, lastuid_old, nummsgs = 0;
- gint ok, exists = 0, recent = 0, unseen = 0;
- guint32 uid_validity = 0;
+ gint ok, i, lastuid_old, nummsgs = 0;
GPtrArray *argbuf;
gchar *cmdbuf = NULL;
gchar *dir;
-
+
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(item != NULL, -1);
g_return_val_if_fail(item->item.path != NULL, -1);
g_return_val_if_fail(session != NULL, -1);
ok = imap_select(session, IMAP_FOLDER(folder), item->item.path,
- &exists, &recent, &unseen, &uid_validity);
+ NULL, NULL, NULL, NULL);
if (ok != IMAP_SUCCESS)
return -1;
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;
}
{
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;
projects / claws.git / blobdiff